diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-10-30 13:05:28 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-10-30 13:05:28 -0400 |
| commit | cb0677fbffa53db9682277bc796384a7af715a91 (patch) | |
| tree | 974ab3629971c393bb09533cfe1c6b30b3a22876 /engine | |
| parent | a50dd81e3737d8dc14f4a700255b3a19c58988b1 (diff) | |
| download | elgg-cb0677fbffa53db9682277bc796384a7af715a91.tar.gz elgg-cb0677fbffa53db9682277bc796384a7af715a91.tar.bz2 | |
setting $CONFIG->context earlier to avoid using the context functions before it is initialized
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/configuration.php | 2 | ||||
| -rw-r--r-- | engine/lib/pageowner.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index c6db515e8..615063f3d 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -572,6 +572,8 @@ function set_default_config() { } } + $CONFIG->context = array(); + return true; } diff --git a/engine/lib/pageowner.php b/engine/lib/pageowner.php index d1010fda6..9d41d74c1 100644 --- a/engine/lib/pageowner.php +++ b/engine/lib/pageowner.php @@ -263,12 +263,9 @@ function elgg_in_context($context) { * @access private */ function page_owner_boot() { - global $CONFIG; elgg_register_plugin_hook_handler('page_owner', 'system', 'default_page_owner_handler'); - $CONFIG->context = array(); - // Bootstrap the context stack by setting its first entry to the handler. // This is the first segment of the URL and the handler is set by the rewrite rules. // @todo this does not work for actions |