Merged from MOODLE_14_STABLE

Fixes bug #2147 http://moodle.org/bugs/bug.php?op=show&bugid=2147

The config.php generated by install.php was missing $CFG->admin -- credit goes to serge.laot@wanadoo.fr for the report and patch.

diff --git a/install.php b/install.php
index 6d3fa5bfbd2df8982c86e3359ecb85e0b7ef3a3b..62bba9b3011557ee50da1569a77a71e216254cf7 100644 (file)
--- a/install.php
+++ b/install.php
@@ -303,6 +303,7 @@ if ($nextstage == 5) {
     $str .= '$CFG->wwwroot   = \''.$INSTALL['wwwroot']."';\r\n";
     $str .= '$CFG->dirroot   = \''.$INSTALL['dirroot']."';\r\n";
     $str .= '$CFG->dataroot  = \''.$INSTALL['dataroot']."';\r\n";
+    $str .= '$CFG->admin     = \''.$INSTALL['admindirname']."';\r\n";
     $str .= "\r\n";
 
     $str .= '$CFG->directorypermissions = 0777;'."\r\n";