aboutsummaryrefslogtreecommitdiff
path: root/engine/start.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-28 19:17:36 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-28 19:17:36 +0000
commit7ddd9521b3f3a397da3b0a6b56238d31414eb4be (patch)
tree6eb6a9a51db5fa0f5d3cc2ec6de29b9e258b12a1 /engine/start.php
parentbd3484417d170e62bc94e9db81d4ad37e8ddee6a (diff)
downloadelgg-7ddd9521b3f3a397da3b0a6b56238d31414eb4be.tar.gz
elgg-7ddd9521b3f3a397da3b0a6b56238d31414eb4be.tar.bz2
Standardized code in all of core, not including language files, tests, or core mods.
git-svn-id: http://code.elgg.org/elgg/trunk@7124 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/start.php')
-rw-r--r--engine/start.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/start.php b/engine/start.php
index 35c382a5f..5d08c77d5 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -74,8 +74,8 @@ foreach ($required_files as $file) {
}
// Register the error handler
-set_error_handler('__elgg_php_error_handler');
-set_exception_handler('__elgg_php_exception_handler');
+set_error_handler('_elgg_php_error_handler');
+set_exception_handler('_elgg_php_exception_handler');
/**
* Load the system settings
@@ -103,7 +103,7 @@ $lib_files = array(
'users.php', 'version.php', 'widgets.php', 'xml.php', 'xml-rpc.php'
);
-foreach($lib_files as $file) {
+foreach ($lib_files as $file) {
$file = $lib_dir . $file;
elgg_log("Loading $file...");
if (!include_once($file)) {
@@ -132,7 +132,7 @@ trigger_elgg_event('init', 'system');
// Regenerate the simple cache if expired.
// Don't do it on upgrade because upgrade does it itself.
// @todo - move into function and perhaps run off init system event
-if (!defined('upgrading')) {
+if (!defined('UPGRADING')) {
$view = get_input('view', 'default');
$lastupdate = datalist_get("simplecache_lastupdate_$view");
$lastcached = datalist_get("simplecache_lastcached_$view");