L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving some functions to setuplib.php so they are first

Browse Source
This commit is contained in:
moodler
2006-01-05 07:08:10 +00:00
parent f66a6ab716
commit d3f9f1f85d
4 changed files with 92 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/setup.php
+6 -30
View File
@@ -87,7 +87,11 @@ global $HTTPSPAGEREQUIRED;
/// Set httpswwwroot default value (this variable will replace $CFG->wwwroot
/// inside some URLs used in HTTPSPAGEREQUIRED pages.
$CFG->httpswwwroot = $CFG->wwwroot;
$CFG->httpswwwroot = $CFG->wwwroot;
$CFG->libdir = $CFG->dirroot .'/lib';
require_once($CFG->libdir .'/setuplib.php'); // Functions that MUST be loaded first
/// Time to start counting
init_performance_info();
@@ -106,7 +110,6 @@ $CFG->httpswwwroot = $CFG->wwwroot;
/// Connect to the database using adodb
$CFG->libdir = $CFG->dirroot .'/lib';
require_once($CFG->libdir .'/adodb/adodb.inc.php'); // Database access functions
@@ -526,31 +529,4 @@ $CFG->httpswwwroot = $CFG->wwwroot;
}
/**
* Initializes our performance info early.
*
* Pairs up with get_performance_info() which is actually
* in moodlelib.php. This function is here so that we can
* call it before all the libs are pulled in.
*
* @uses $PERF
*/
function init_performance_info() {
global $PERF;
$PERF = new Object;
$PERF->dbqueries = 0;
$PERF->logwrites = 0;
if (function_exists('microtime')) {
$PERF->starttime = microtime();
}
if (function_exists('memory_get_usage')) {
$PERF->startmemory = memory_get_usage();
}
if (function_exists('posix_times')) {
$PERF->startposixtimes = posix_times();
}
}
?>
?>