Fixes #1528: Correctly throwing exceptions for objects, groups, and users.

git-svn-id: http://code.elgg.org/elgg/trunk@3968 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 14 insertions, 14 deletions

diff --git a/engine/lib/group.php b/engine/lib/group.php
index a87dbf071..58fd4adab 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -49,7 +49,7 @@ class ElggGroup extends ElggEntity
 			// Is $guid is an ElggGroup? Use a copy constructor
 			else if ($guid instanceof ElggGroup) {
 				elgg_deprecated_notice('This type of usage of the ElggGroup constructor was deprecated. Please use the clone method.', 1.7);
-				
+
 				foreach ($guid->attributes as $key => $value) {
 					$this->attributes[$key] = $value;
 				}
@@ -61,7 +61,7 @@ class ElggGroup extends ElggEntity
 			// We assume if we have got this far, $guid is an int
 			else if (is_numeric($guid)) {
 				if (!$this->load($guid)) {
-					IOException(sprintf(elgg_echo('IOException:FailedToLoadGUID'), get_class(), $guid));
+					throw new IOException(sprintf(elgg_echo('IOException:FailedToLoadGUID'), get_class(), $guid));
 				}
 			}
 
@@ -747,13 +747,13 @@ function get_entities_from_metadata_groups_multi($group_guid, $meta_array, $enti
  */
 function get_group_members($group_guid, $limit = 10, $offset = 0, $site_guid = 0, $count = false) {
 	return elgg_get_entities_from_relationship(array(
-		'relationship' => 'member', 
-		'relationship_guid' => $group_guid, 
-		'inverse_relationship' => TRUE, 
-		'types' => 'user', 
-		'limit' => $limit, 
-		'offset' => $offset, 
-		'count' => $count, 
+		'relationship' => 'member',
+		'relationship_guid' => $group_guid,
+		'inverse_relationship' => TRUE,
+		'types' => 'user',
+		'limit' => $limit,
+		'offset' => $offset,
+		'count' => $count,
 		'site_guid' => $site_guid
 	));
 }
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 85ad92a07..6023a4805 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -55,7 +55,7 @@ class ElggObject extends ElggEntity {
 			// Is $guid is an ElggObject? Use a copy constructor
 			else if ($guid instanceof ElggObject) {
 				elgg_deprecated_notice('This type of usage of the ElggObject constructor was deprecated. Please use the clone method.', 1.7);
-				
+
 				foreach ($guid->attributes as $key => $value) {
 					$this->attributes[$key] = $value;
 				}
@@ -69,7 +69,7 @@ class ElggObject extends ElggEntity {
 			// We assume if we have got this far, $guid is an int
 			else if (is_numeric($guid)) {
 				if (!$this->load($guid)) {
-					IOException(sprintf(elgg_echo('IOException:FailedToLoadGUID'), get_class(), $guid));
+					throw new IOException(sprintf(elgg_echo('IOException:FailedToLoadGUID'), get_class(), $guid));
 				}
 			}
 
@@ -343,8 +343,8 @@ function get_object_sites($object_guid, $limit = 10, $offset = 0) {
 	$offset = (int)$offset;
 
 	return elgg_get_entities_from_relationship(array(
-		'relationship' => 'member_of_site', 
-		'relationship_guid' => $object_guid, 
+		'relationship' => 'member_of_site',
+		'relationship_guid' => $object_guid,
 		'types' => 'site',
 		'limit' => $limit,
 		'offset' => $offset
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 1d08bd133..549dd3595 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -90,7 +90,7 @@ class ElggUser extends ElggEntity
 			// We assume if we have got this far, $guid is an int
 			else if (is_numeric($guid)) {
 				if (!$this->load($guid)) {
-					IOException(sprintf(elgg_echo('IOException:FailedToLoadGUID'), get_class(), $guid));
+					throw new IOException(sprintf(elgg_echo('IOException:FailedToLoadGUID'), get_class(), $guid));
 				}
 			}