MDL-14739 - move the emoticons configuration in the common section

diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php
index cb747b9d5e0e3bf1f4c5a78e6c94f7fd2087aad6..041230844cb2a946c71daac751e9c96a40b33bfa 100644 (file)
--- a/admin/settings/appearance.php
+++ b/admin/settings/appearance.php
@@ -58,6 +58,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     }
     $temp->add(new admin_setting_configselect('defaulthtmleditor', get_string('defaulthtmleditor', 'admin'), null, 'tinymce', $htmleditors));
     $temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
+    $temp->add(new admin_setting_emoticons());
     $ADMIN->add('htmleditor', $temp);
 
     $temp = new admin_settingpage('htmlarea', get_string('htmlarea', 'admin'));
@@ -71,7 +72,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
       $temp->add(new admin_setting_special_editordictionary());
     }
     $temp->add(new admin_setting_special_editorhidebuttons());
-    $temp->add(new admin_setting_emoticons());
     $ADMIN->add('htmleditor', $temp);
 
     $temp = new admin_settingpage('tinymce', get_string('tinymce', 'admin'));