MDL-12678 moved pinned blocks setup page to Modules/Blocks/; merged from MOODLE_19_STABLE

diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php
index f656f8b54f3eace9337cd94e44d7d2386ea7603e..dcd4c4592267601a3149ea5f95d77eba22e1f1b5 100644 (file)
--- a/admin/settings/appearance.php
+++ b/admin/settings/appearance.php
@@ -77,8 +77,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_special_coursemanager());
     $ADMIN->add('appearance', $temp);
 
-    $ADMIN->add('appearance', new admin_externalpage('stickyblocks', get_string('stickyblocks', 'admin'), "$CFG->wwwroot/$CFG->admin/stickyblocks.php"));
-
     $temp = new admin_settingpage('ajax', get_string('ajaxuse'));
     $temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 0));
     $ADMIN->add('appearance', $temp);

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 061471217b55003addb514b4ab1a6e061382862d..d81174134f0babaebafb4dac80b094f295b13aa3 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -36,6 +36,7 @@ if ($hassiteconfig) {
 
     $ADMIN->add('modules', new admin_category('blocksettings', get_string('blocks')));
     $ADMIN->add('blocksettings', new admin_page_manageblocks());
+    $ADMIN->add('blocksettings', new admin_externalpage('stickyblocks', get_string('stickyblocks', 'admin'), "$CFG->wwwroot/$CFG->admin/stickyblocks.php"));
     if (!empty($CFG->blocks_version) and $blocks = get_records('block')) {
         $blockbyname = array();