MDL-50155 core: Move and rename common settings config page

AMOS BEGIN CPY [commonsettings,admin],[commonactivitysettings,admin] AMOS END
moodle · May 18, 2015 · b3834b3 · b3834b3
1 parent b5dbb12
commit b3834b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
@@ -33,13 +33,13 @@
     // activity modules
     $ADMIN->add('modules', new admin_category('modsettings', new lang_string('activitymodules')));
 
-    $temp = new admin_settingpage('managemodulescommon', new lang_string('commonsettings', 'admin'));
+    $ADMIN->add('modsettings', new admin_page_managemods());
 
+    $temp = new admin_settingpage('managemodulescommon', new lang_string('commonactivitysettings', 'admin'));
     $temp->add(new admin_setting_configcheckbox('requiremodintro',
         get_string('requiremodintro', 'admin'), get_string('requiremodintro_desc', 'admin'), 0));
     $ADMIN->add('modsettings', $temp);
 
-    $ADMIN->add('modsettings', new admin_page_managemods());
     foreach (core_plugin_manager::instance()->get_plugins_of_type('mod') as $plugin) {
         /** @var \core\plugininfo\mod $plugin */
         $plugin->load_settings($ADMIN, 'modsettings', $hassiteconfig);

diff --git a/lang/en/admin.php b/lang/en/admin.php
@@ -120,6 +120,7 @@
 $string['cliupgradenoneed'] = 'No upgrade needed for the installed version {$a}. Thanks for coming anyway!';
 $string['cliyesnoprompt'] = 'type y (means yes) or n (means no)';
 $string['commentsperpage'] = 'Comments displayed per page';
+$string['commonactivitysettings'] = 'Common activity settings';
 $string['commonfiltersettings'] = 'Common filter settings';
 $string['commonsettings'] = 'Common settings';
 $string['componentinstalled'] = 'Component installed';