From 1ddc3d1f4c399b6d4f4c2a0e7bd4ba7ec3bf5771 Mon Sep 17 00:00:00 2001
From: Davo Smith <git@davosmith.co.uk>
Date: Mon, 21 May 2012 10:03:55 +0100
Subject: [PATCH] MDL-22504 Course drag and drop upload - experimental setting
 is now a checkbox

---
 admin/settings/development.php | 4 +---
 course/dnduploadlib.php        | 2 +-
 lang/en/admin.php              | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/admin/settings/development.php b/admin/settings/development.php
index dcddf32a903..e55e1f28f00 100644
--- a/admin/settings/development.php
+++ b/admin/settings/development.php
@@ -13,9 +13,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', new lang_string('enablesafebrowserintegration', 'admin'), new lang_string('configenablesafebrowserintegration', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('enablegroupmembersonly', new lang_string('enablegroupmembersonly', 'admin'), new lang_string('configenablegroupmembersonly', 'admin'), 0));
 
-    $dndopts = array(0 => new lang_string('dnduploadfiles', 'admin'),
-                     1 => new lang_string('dnduploadfilestextlink', 'admin'));
-    $temp->add(new admin_setting_configselect('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0, $dndopts));
+    $temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
 
     $ADMIN->add('experimental', $temp);
 
diff --git a/course/dnduploadlib.php b/course/dnduploadlib.php
index d82da3544e2..01eb3c119ac 100644
--- a/course/dnduploadlib.php
+++ b/course/dnduploadlib.php
@@ -312,7 +312,7 @@ class dndupload_handler {
         uasort($this->types, array($this, 'type_compare'));
 
         $ret->types = array();
-        if ($CFG->dndallowtextandlinks) {
+        if (!empty($CFG->dndallowtextandlinks)) {
             foreach ($this->types as $type) {
                 if (empty($type->handlers)) {
                     continue; // Skip any types without registered handlers.
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 9ae4445a51a..2ac7b1e2a6b 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -432,9 +432,7 @@ $string['devicetype'] = 'Device type';
 $string['disableuserimages'] = 'Disable user profile images';
 $string['displayerrorswarning'] = 'Enabling the PHP setting <em>display_errors</em> is not recommended on production sites because some error messages may reveal sensitive information about your server.';
 $string['displayloginfailures'] = 'Display login failures to';
-$string['dndallowtextandlinks'] = 'Drag and drop upload allows';
-$string['dnduploadfiles'] = 'files only';
-$string['dnduploadfilestextlink'] = 'files, text and links';
+$string['dndallowtextandlinks'] = 'Drag and drop upload of text/links';
 $string['docroot'] = 'Moodle Docs document root';
 $string['doctonewwindow'] = 'Open in new window';
 $string['download'] = 'Download';