diff options
| author | nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-18 19:57:33 +0000 |
|---|---|---|
| committer | nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-18 19:57:33 +0000 |
| commit | 9edaa3c385610ebb45a9e8282a002e666d7d8c91 (patch) | |
| tree | 0cb277d714267ede0b59836b0f2c18f59aba5daf | |
| parent | 97d7421baea83266f611bcc3534840dd146cdec1 (diff) | |
| download | elgg-9edaa3c385610ebb45a9e8282a002e666d7d8c91.tar.gz elgg-9edaa3c385610ebb45a9e8282a002e666d7d8c91.tar.bz2 | |
Ensuring the Walled Garden hook properly exits before plugins can continue to extend view.
git-svn-id: http://code.elgg.org/elgg/trunk@6087 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/elgglib.php | 3 | ||||
| -rw-r--r-- | engine/lib/sites.php | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index eac75403f..93fb7dc28 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -3177,6 +3177,9 @@ function elgg_walled_garden_index() { $layout = elgg_view_layout('one_column', $login); echo page_draw('', $layout); + + // @hack Index must exit to keep plugins from continuing to extend + exit; return TRUE; } diff --git a/engine/lib/sites.php b/engine/lib/sites.php index 36630548e..e6eb71afc 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -248,7 +248,8 @@ class ElggSite extends ElggEntity { global $CONFIG; if ($CONFIG->walled_garden && !isloggedin()) { - register_plugin_hook('index', 'system', 'elgg_walled_garden_index'); + // hook into the index system call at the highest priority + register_plugin_hook('index', 'system', 'elgg_walled_garden_index', 1); if (!$this->is_public_page()) { register_error(elgg_echo('loggedinrequired')); |