Merged from MOODLE_19_STABLE:

More on MDL-11561 - fixed up path to local/ settings file to be more consistent,
added documentation in lib/locallib.php on how to create new local admin tree item

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 58b245244476f700ad56c2e7e961df41e46a29db..e3e96564ac10fc89fd44fec4e0db34e19c0a9354 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4125,8 +4125,8 @@ 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');
+        if (file_exists($CFG->dirroot.'/local/settings.php')) {
+            include_once($CFG->dirroot.'/local/settings.php');
         }
     }
 

diff --git a/lib/locallib.php b/lib/locallib.php
index f1f1ecc190e053e109eea56df27e10dd21382d92..a4b89a83c857d5d9e58742e9a1dc4c3ebedc9cc4 100644 (file)
--- a/lib/locallib.php
+++ b/lib/locallib.php
@@ -48,6 +48,17 @@
  * with $oldversion set to 0, so that all the updates run.
  *
  *
+ * Local admin menu items
+ * ----------------------
+ *
+ * It is possible to add new items to the admin_tree block.  
+ * To do this, create a file, local/settings.php
+ * which can access the $ADMIN variable directly and add things to it.
+ * You might do something like:
+ * $ADMIN->add('root', new admin_category($name, $title);
+ * $ADMIN->add('foo', new admin_externalpage($name, $title, $url, $cap);
+ *
+ *
  * Course deletion
  * ---------------
  *