From: martinlanghoff <martinlanghoff>
Date: Mon, 13 Dec 2004 07:38:43 +0000 (+0000)
Subject: Merged from MOODLE_14_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e35d275e1fc7a78920aa1ec7f9142254d51759db;p=moodle.git

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 6d3fa5bfbd..62bba9b301 100644
--- 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";