Further fixes.

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

2 files changed, 5 insertions, 5 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 14e5d0425..161ba5487 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1201,7 +1201,7 @@
 				$where[] = "owner_guid in ({$owner_guid})";
 			}

 			if (is_null($container_guid)) {

-				$container_guid = array_merge(array(0 => 0),$owner_array);

+				$container_guid = $owner_array;

 			}
 		}
 		if ($site_guid > 0)
diff --git a/engine/lib/users.php b/engine/lib/users.php
index f7155cb1a..8dc13fafa 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -517,7 +517,7 @@
 	 * @return false|array An array of ElggObjects or false, depending on success

 	 */

 	function get_user_objects($user_guid, $subtype = "", $limit = 10, $offset = 0) {

-		$ntt = get_entities('object',$subtype, $user_guid, "time_created desc", $limit, $offset,false,0,array(0,$user_guid));

+		$ntt = get_entities('object',$subtype, $user_guid, "time_created desc", $limit, $offset,false,0,$user_guid);

 		return $ntt;

 	}

 	

@@ -529,7 +529,7 @@
 	 * @return int The number of objects the user owns (of this subtype)

 	 */

 	function count_user_objects($user_guid, $subtype = "") {

-		$total = get_entities('object', $subtype, $user_guid, "time_created desc", null, null, true, 0, array(0, $user_guid));

+		$total = get_entities('object', $subtype, $user_guid, "time_created desc", null, null, true, 0, $user_guid);

 		return $total;

 	}

 

@@ -570,7 +570,7 @@
 			foreach($friends as $friend) {

 				$friendguids[] = $friend->getGUID();

 			}

-			return get_entities('object',$subtype,$friendguids, "time_created desc", $limit, $offset, false, 0, array_merge(array(0),$friendguids));

+			return get_entities('object',$subtype,$friendguids, "time_created desc", $limit, $offset, false, 0, $friendguids);

 		}

 		return false;

 	}

@@ -588,7 +588,7 @@
 			foreach($friends as $friend) {

 				$friendguids[] = $friend->getGUID();

 			}

-			return get_entities('object',$subtype,$friendguids, "time_created desc", $limit, $offset, true, 0, array_merge(array(0),$friendguids));

+			return get_entities('object',$subtype,$friendguids, "time_created desc", $limit, $offset, true, 0, $friendguids);

 		}

 		return 0;

 	}