mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-39854 fix installer regression caused by new core_component

Browse Source
This commit is contained in:
Petr Škoda 2013-06-18 10:31:26 +02:00
parent 0bd0328e6c
commit 1abf2f6acc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/cli/install.php
View File

@ -131,6 +131,8 @@ define('MOODLE_INTERNAL', true);
// Disables all caching.
define('CACHE_DISABLE_ALL', true);
define('PHPUNIT_TEST', false);
// Check that PHP is of a sufficient version
if (version_compare(phpversion(), "5.3.3") < 0) {
$phpversion = phpversion();
@ -160,6 +162,7 @@ $CFG->admin = array_pop($parts);
//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'));
require_once($CFG->libdir.'/classes/component.php');
require_once($CFG->libdir.'/installlib.php');
require_once($CFG->libdir.'/clilib.php');
require_once($CFG->libdir.'/setuplib.php');

4
install.php
View File

@ -46,6 +46,7 @@ if (file_exists($configfile)) {
define('CLI_SCRIPT', false); // prevents some warnings later
define('AJAX_SCRIPT', false); // prevents some warnings later
define('CACHE_DISABLE_ALL', true); // Disables caching.. just in case.
define('PHPUNIT_TEST', false);
// Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
// This is a quick hack. Ideally we should ask the admin for a value. See MDL-22625 for more on this.
@ -88,7 +89,8 @@ if (PHP_INT_SIZE > 4) {
/** Used by library scripts to check they are being called by Moodle */
define('MOODLE_INTERNAL', true);
require dirname(__FILE__).'/lib/installlib.php';
require_once(__DIR__.'/lib/classes/component.php');
require_once(__DIR__.'/lib/installlib.php');
// TODO: add lang detection here if empty $_REQUEST['lang']