diff options
| author | cash <cash.costello@gmail.com> | 2011-11-18 17:50:36 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-11-18 17:50:36 -0500 |
| commit | 30630b3a25e37430d966af6e6af933b7d000ab1a (patch) | |
| tree | 78217703e860125d43b592ab65d0b4ab2a9ca5a5 | |
| parent | 15f02eea51f0f0eb92e427b627324d58af166e5e (diff) | |
| download | elgg-30630b3a25e37430d966af6e6af933b7d000ab1a.tar.gz elgg-30630b3a25e37430d966af6e6af933b7d000ab1a.tar.bz2 | |
Fixes #4118 returning bool from leave group functions
| -rw-r--r-- | engine/classes/ElggGroup.php | 6 | ||||
| -rw-r--r-- | engine/lib/relationships.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/classes/ElggGroup.php b/engine/classes/ElggGroup.php index 49ba27204..5c16e978f 100644 --- a/engine/classes/ElggGroup.php +++ b/engine/classes/ElggGroup.php @@ -309,7 +309,7 @@ class ElggGroup extends ElggEntity * * @param ElggUser $user User * - * @return void + * @return bool */ public function leave(ElggUser $user) { return leave_group($this->getGUID(), $user->getGUID()); @@ -322,7 +322,7 @@ class ElggGroup extends ElggEntity * * @param int $guid GUID of an ElggGroup entity * - * @return true + * @return bool */ protected function load($guid) { // Test to see if we have the generic stuff @@ -340,7 +340,7 @@ class ElggGroup extends ElggEntity $row = get_group_entity_as_row($guid); if (($row) && (!$this->isFullyLoaded())) { // If $row isn't a cached copy then increment the counter - $this->attributes['tables_loaded'] ++; + $this->attributes['tables_loaded']++; } // Now put these into the attributes array as core values diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index 3578f0cb8..5b7080b56 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -158,7 +158,7 @@ function remove_entity_relationship($guid_one, $relationship, $guid_two) { and relationship='$relationship' and guid_two=$guid_two"; - return delete_data($query); + return (bool)delete_data($query); } else { return false; } |