Preventig bug affecting sites with modified wwwroot and

custom admin dir. Bug 5031.
(http://moodle.org/bugs/bug.php?op=show&bugid=5031)

diff --git a/install.php b/install.php
index 3136f3bbdbcb48783e48942e25c2c854ffd3a417..4af6ab35c6bf6ea9fd74adcc288f87a292fd3806 100644 (file)
--- a/install.php
+++ b/install.php
@@ -343,7 +343,7 @@ if ($INSTALL['stage'] == DATABASE) {
 if ($nextstage == ADMIN or $INSTALL['stage'] == ADMIN) {
     if (!ini_get('allow_url_fopen')) {
         $nextstage = ($goforward) ? ENVIRONMENT : DATABASE;
-    } else if (($fh = @fopen($INSTALL['wwwroot'].'/'.$INSTALL['admindirname'].'/site.html', 'r')) !== false) {
+    } else if (($fh = @fopen($INSTALL['wwwrootform'].'/'.$INSTALL['admindirname'].'/site.html', 'r')) !== false) {
         $nextstage = ($goforward) ? ENVIRONMENT : DATABASE;
         fclose($fh);
     } else {