setting $CONFIG->context earlier to avoid using the context functions before it is...

diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index c6db515e82fd1a815a985afba55130245556c3c4..615063f3dd1cebd3122bac84770355d5b6f2e22a 100644 (file)
--- 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 d1010fda62b49f02a2c8ec2b88b4e01347eea6af..9d41d74c1eca803a913d2764c6c142e870770906 100644 (file)
--- 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