fixes #1374 - owner_guid wasn't being set correctly in options array

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

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 9e99d82f27c463710a415908e08edada805c9435..c50e5ccb92658c256475e01a4440f143de6cce22 100644 (file)
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -713,7 +713,7 @@ function get_entities_from_annotations($entity_type = "", $entity_subtype = "",
        }
 
        if ($owner_guid) {
-               $options['owner'] = $owner_guid;
+               $options['owner_guid'] = $owner_guid;
        }
 
        if ($limit) {

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 12c196bb14f52a3f208abd0450491b825e9b518b..a19e20ea0d6a719e8f7d4ef6fdd4cdce4edb4842 100644 (file)
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -809,7 +809,7 @@ $count = FALSE, $case_sensitive = TRUE) {
        }
 
        if ($owner_guid) {
-               $options['owner'] = $owner_guid;
+               $options['owner_guid'] = $owner_guid;
        }
 
        if ($limit) {
@@ -899,7 +899,7 @@ $count = false, $meta_array_operator = 'and') {
        }
 
        if ($owner_guid) {
-               $options['owner'] = $owner_guid;
+               $options['owner_guid'] = $owner_guid;
        }
 
        if ($limit) {

diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index 1ba47b15a313282306411f793f5b45fe428a1a4f..71f6568d2d6cb45a38c243ef911531588709769b 100644 (file)
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -613,7 +613,7 @@ $count = false, $site_guid = 0) {
        }
 
        if ($owner_guid) {
-               $options['owner'] = $owner_guid;
+               $options['owner_guid'] = $owner_guid;
        }
 
        if ($limit) {
@@ -824,7 +824,7 @@ function get_entities_from_relationships_and_meta($relationship, $relationship_g
        }
 
        if ($owner_guid) {
-               $options['owner'] = $owner_guid;
+               $options['owner_guid'] = $owner_guid;
        }
 
        if ($limit) {