Refs #2641 merged [7295] into trunk

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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 02c94b8b4c34263a4e77c19e7f1c306d2918b6ea..d1e8b9a3107214d21bcc11613a9fb7baa4d508ad 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2074,7 +2074,12 @@ function elgg_normalise_plural_options_array($options, $singulars) {
                        if ($options[$singular] === ELGG_ENTITIES_ANY_VALUE) {
                                $options[$plural] = $options[$singular];
                        } else {
-                               $options[$plural] = array($options[$singular]);
+                               // Test for array refs #2641
+                               if (!is_array($options[$singular])) {
+                                       $options[$plural] = array($options[$singular]);
+                               } else {
+                                       $options[$plural] = $options[$singular];
+                               }
                        }
                }