From: mjollnir_ <mjollnir_>
Date: Mon, 14 Jan 2008 23:32:43 +0000 (+0000)
Subject: Merged from MOODLE_19_STABLE: MDL-11561 - added support for local/localsettings.php
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0b5e060578453c4120838e1f7c4f47d9736fb5cb;p=moodle.git

Merged from MOODLE_19_STABLE: MDL-11561 - added support for local/localsettings.php
---

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 3a5130a882..58b2452444 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4125,6 +4125,9 @@ function &admin_get_root($reload=false, $requirefulltree=true) {
                 include($file);
             }
         }
+        if (file_exists($CFG->dirroot.'/local/localsettings.php')) {
+            include_once($CFG->dirroot.'/local/localsettings.php');
+        }
     }
 
     return $ADMIN;