From 343b52d48e7ca7b2381387198c47d3bb1a2ed6e1 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 21 Oct 2011 07:34:21 -0400
Subject: Fixes #3988 correctly passing user_guid through canEdit for metadata

---
 engine/classes/ElggMetadata.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engine/classes')

diff --git a/engine/classes/ElggMetadata.php b/engine/classes/ElggMetadata.php
index ed3f8614f..32e7b32f1 100644
--- a/engine/classes/ElggMetadata.php
+++ b/engine/classes/ElggMetadata.php
@@ -45,11 +45,13 @@ class ElggMetadata extends ElggExtender {
 	/**
 	 * Determines whether or not the user can edit this piece of metadata
 	 *
+	 * @param int $user_guid The GUID of the user (defaults to currently logged in user)
+	 *
 	 * @return true|false Depending on permissions
 	 */
-	function canEdit() {
+	function canEdit($user_guid = 0) {
 		if ($entity = get_entity($this->get('entity_guid'))) {
-			return $entity->canEditMetadata($this);
+			return $entity->canEditMetadata($this, $user_guid);
 		}
 		return false;
 	}
-- 
cgit v1.2.3


From 6628e7db7895855784e43fce74c7dec41f01c2dc Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
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')

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