Skip to content

Commit

Permalink
MDL-21249 fixed recent installer regression, sorry
Browse files Browse the repository at this point in the history
  • Loading branch information
skodak committed Jul 26, 2010
1 parent 3b61c7e commit 460ebd6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions admin/cli/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@
// we need a lot of memory
@ini_set('memory_limit', '128M');

/** Used by library scripts to check they are being called by Moodle */
define('MOODLE_INTERNAL', true);

// Check that PHP is of a sufficient version
if (version_compare(phpversion(), "5.2.8") < 0) {
$phpversion = phpversion();
Expand Down
3 changes: 3 additions & 0 deletions install.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
// sudden increases of memory needs ;-)
@ini_set('memory_limit', $minrequiredmemory);

/** Used by library scripts to check they are being called by Moodle */
define('MOODLE_INTERNAL', true);

require dirname(__FILE__).'/lib/installlib.php';

// TODO: add lang detection here if empty $_REQUEST['lang']
Expand Down
2 changes: 2 additions & 0 deletions lib/installlib.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();

/** INSTALL_WELCOME = 0 */
define('INSTALL_WELCOME', 0);
/** INSTALL_ENVIRONMENT = 1 */
Expand Down
4 changes: 1 addition & 3 deletions lib/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@
}
}

/**
* Used by some scripts to check they are being called by Moodle
*/
/** Used by library scripts to check they are being called by Moodle */
define('MOODLE_INTERNAL', true);

/**
Expand Down

0 comments on commit 460ebd6

Please sign in to comment.