Skip to content

Commit

Permalink
MDL-19714 Fatal errors when installing HEAD This is my attempt to fix…
Browse files Browse the repository at this point in the history
… things by copying code from setup.php to install.php. Seems to work now.
  • Loading branch information
tjhunt committed Jul 5, 2009
1 parent 98e10a5 commit 318f051
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions install.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
$CFG->dirroot = str_replace('\\', '/', dirname(__FILE__)); // Fix for win32
$CFG->libdir = "$CFG->dirroot/lib";
$CFG->wwwroot = install_guess_wwwroot(); // can not be changed - ppl must use the real address when installing
$CFG->themedir = $CFG->dirroot.'/theme';
$CFG->themewww = $CFG->wwwroot.'/theme';
$CFG->httpswwwroot = $CFG->wwwroot;
$CFG->httpsthemewww = $CFG->wwwroot;
$CFG->dataroot = $config->dataroot;
Expand All @@ -141,6 +143,7 @@
require_once($CFG->libdir.'/setuplib.php');
require_once($CFG->libdir.'/textlib.class.php');
require_once($CFG->libdir.'/weblib.php');
require_once($CFG->libdir.'/outputlib.php');
require_once($CFG->libdir.'/dmllib.php');
require_once($CFG->libdir.'/moodlelib.php');
require_once($CFG->libdir.'/deprecatedlib.php');
Expand All @@ -149,6 +152,12 @@
require_once($CFG->libdir.'/xmlize.php');
require_once($CFG->libdir.'/componentlib.class.php');

//point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
//the problem is that we need specific version of quickforms and hacked excel files :-(
ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
//point zend include path to moodles lib/zend so that includes and requires will search there for files before anywhere else
ini_set('include_path', $CFG->libdir.'/zend' . PATH_SEPARATOR . ini_get('include_path'));

require('version.php');
$CFG->target_release = $release;

Expand Down

0 comments on commit 318f051

Please sign in to comment.