From 823e64a78c0c1a460f05a1a6be40a77c9fbebcae Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 31 May 2008 09:54:12 +0000
Subject: [PATCH] MDL-14679 towards /admin/settings conversion

---
 admin/settings/plugins.php  | 4 ++--
 admin/settings/security.php | 2 +-
 lib/adminlib.php            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index f1fd753fed..cbc6132e19 100644
--- 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 31653e6820..b82cdb161c 100644
--- 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 690b9305da..390998e6f3 100644
--- 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;
 
-- 
2.39.5