From 300a377ec43bc200fe7365862ad83b47609c6402 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 9 Oct 2011 07:58:16 -0400 Subject: Fixes #3878 registering the security token action as an external page --- engine/classes/ElggSite.php | 1 + 1 file changed, 1 insertion(+) (limited to 'engine/classes/ElggSite.php') diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 40bfca060..44929ce21 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -413,6 +413,7 @@ class ElggSite extends ElggEntity { 'resetpassword', 'action/user/requestnewpassword', 'action/user/passwordreset', + 'action/security/refreshtoken', 'upgrade\.php', 'xml-rpc\.php', 'mt/mt-xmlrpc\.cgi', -- cgit v1.2.3 From 566d0850be54c1a1c79028ac536faa31358a55fe Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 9 Oct 2011 12:28:12 -0400 Subject: Fixes #3729 handling forwarding to page when logging into a walled garden --- engine/classes/ElggSite.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engine/classes/ElggSite.php') diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 44929ce21..8708800cf 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -371,6 +371,7 @@ class ElggSite extends ElggEntity { elgg_register_plugin_hook_handler('index', 'system', 'elgg_walled_garden_index', 1); if (!$this->isPublicPage()) { + $_SESSION['last_forward_from'] = current_page_url(); register_error(elgg_echo('loggedinrequired')); forward(); } @@ -414,6 +415,7 @@ class ElggSite extends ElggEntity { 'action/user/requestnewpassword', 'action/user/passwordreset', 'action/security/refreshtoken', + 'ajax/view/js/languages', 'upgrade\.php', 'xml-rpc\.php', 'mt/mt-xmlrpc\.cgi', -- cgit v1.2.3 From 6628e7db7895855784e43fce74c7dec41f01c2dc Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 21 Oct 2011 07:37:10 -0400 Subject: updated ElggSite::disable() to conform to ElggEntity::disable() --- engine/classes/ElggSite.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'engine/classes/ElggSite.php') diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 8708800cf..16b80b9d3 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -190,18 +190,19 @@ class ElggSite extends ElggEntity { * @note You cannot disable the current site. * * @param string $reason Optional reason for disabling + * @param bool $recursive Recursively disable all contained entities? * * @return bool * @throws SecurityException */ - public function disable($reason = "") { + public function disable($reason = "", $recursive = true) { global $CONFIG; if ($CONFIG->site->getGUID() == $this->guid) { throw new SecurityException('SecurityException:deletedisablecurrentsite'); } - return parent::disable($reason); + return parent::disable($reason, $recursive); } /** @@ -225,7 +226,7 @@ class ElggSite extends ElggEntity { 'offset' => $offset, ); } - + $defaults = array( 'relationship' => 'member_of_site', 'relationship_guid' => $this->getGUID(), -- cgit v1.2.3