MDL-29351 add missing temp and cache dirs to installers

diff --git a/admin/cli/install.php b/admin/cli/install.php
index 0dd5102..4b37382 100644 (file)
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -131,6 +131,8 @@ $CFG->libdir               = "$CFG->dirroot/lib";
 $CFG->wwwroot              = "http://localhost";
 $CFG->httpswwwroot         = $CFG->wwwroot;
 $CFG->dataroot             = str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata');
+$CFG->tempdir              = $CFG->dataroot.'/temp';
+$CFG->cachedir             = $CFG->dataroot.'/temp';
 $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;

diff --git a/install.php b/install.php
index eb7189f..533c7ae 100644 (file)
--- a/install.php
+++ b/install.php
@@ -165,6 +165,8 @@ $CFG->libdir               = "$CFG->dirroot/lib";
 $CFG->wwwroot              = install_guess_wwwroot(); // can not be changed - ppl must use the real address when installing
 $CFG->httpswwwroot         = $CFG->wwwroot;
 $CFG->dataroot             = $config->dataroot;
+$CFG->tempdir              = $CFG->dataroot.'/temp';
+$CFG->cachedir             = $CFG->dataroot.'/temp';
 $CFG->admin                = $config->admin;
 $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->langotherroot        = $CFG->dataroot.'/lang';