MDL-14679 towards /admin/settings conversion

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index f1fd753fede3aac7e810e04a7ba8088e9d926195..cbc6132e19d5bc71e527f139d4af3d985b701d35 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -4,7 +4,7 @@ if ($hassiteconfig) {
 
     $ADMIN->add('modules', new admin_category('modsettings', get_string('activities')));
     $ADMIN->add('modsettings', new admin_page_managemods());
-    if ($modules = get_records('modules')) {
+    if ($modules = $DB->get_records('modules')) {
         $modulebyname = array();
 
         foreach ($modules as $module) {
@@ -41,7 +41,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')) {
+    if (!empty($CFG->blocks_version) and $blocks = $DB->get_records('block')) {
         $blockbyname = array();
 
         foreach ($blocks as $block) {

diff --git a/admin/settings/security.php b/admin/settings/security.php
index 31653e682095d72429dfc7ec6ada74689e76c5da..b82cdb161ca5d998df7d022a38fb6f9a4f35f6ec 100644 (file)
--- a/admin/settings/security.php
+++ b/admin/settings/security.php
@@ -69,7 +69,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
                                                                                                                                                                               'all' => 'All courses',
                                                                                                                                                                               'requested' => 'Requested courses')));
     $temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin'), 0));
-    if (!$options = get_records("modules")) {
+    if (!$options = $DB->get_records('modules')) {
         $options = array();
     }
     $options2 = array();

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 690b9305daf1b449bb77f53688560d52f328ec49..390998e6f344aa4affef423af066ce1c038e8998 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4087,7 +4087,7 @@ function admin_externalpage_print_footer() {
  * @return reference
  */
 function &admin_get_root($reload=false, $requirefulltree=true) {
-    global $CFG;
+    global $CFG, $DB;
 
     static $ADMIN = NULL;