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

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 3a5130a882e30c4b1bccca1dcc73887355b37c72..58b245244476f700ad56c2e7e961df41e46a29db 100644 (file)
--- 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;