diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-11 02:37:19 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-11 02:37:19 +0000 |
| commit | 58fe8d45eb074b3f3417cb286bcd89d1fd5c6a29 (patch) | |
| tree | 23302e585ebdad02812a16a0c03533db2d1f21ad /engine | |
| parent | 404f96c8bbe3854ca3b953b8bc230838d54e1ada (diff) | |
| download | elgg-58fe8d45eb074b3f3417cb286bcd89d1fd5c6a29.tar.gz elgg-58fe8d45eb074b3f3417cb286bcd89d1fd5c6a29.tar.bz2 | |
Refs #2641 merged [7295] into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@7296 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/elgglib.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 02c94b8b4..d1e8b9a31 100644 --- 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]; + } } } |