diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-29 13:09:12 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-29 13:09:12 +0000 |
| commit | 3a8b119331beca1e31b3f7ca376395acb9ab3bb0 (patch) | |
| tree | 5cbe9232ecedbf16bdb613e112e41c392f10e499 /engine/lib/annotations.php | |
| parent | e7a200f0105e8f0a2ca46e5485c93e08c380dc2f (diff) | |
| download | elgg-3a8b119331beca1e31b3f7ca376395acb9ab3bb0.tar.gz elgg-3a8b119331beca1e31b3f7ca376395acb9ab3bb0.tar.bz2 | |
Merged [6875] from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6878 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/annotations.php')
| -rw-r--r-- | engine/lib/annotations.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php index 7f5ab93f2..806e3699f 100644 --- a/engine/lib/annotations.php +++ b/engine/lib/annotations.php @@ -526,7 +526,11 @@ $timelower = 0, $timeupper = 0) { } if ($owner_guid) { - $options['annotation_owner_guid'] = $owner_guid; + if (is_array($owner_guid)) { + $options['annotation_owner_guids'] = $owner_guid; + } else { + $options['annotation_owner_guid'] = $owner_guid; + } } if ($group_guid) { |