diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-02 22:24:13 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-02 22:24:13 +0000 |
| commit | 50183d27f7249de7f855889b620a197451a01286 (patch) | |
| tree | ee9e9c62cdf478686344778397787dc86faf0e89 | |
| parent | 8c065fad674693e105ef9f9188774f622aeb8b15 (diff) | |
| download | elgg-50183d27f7249de7f855889b620a197451a01286.tar.gz elgg-50183d27f7249de7f855889b620a197451a01286.tar.bz2 | |
Search types without a subtype now display properly.
git-svn-id: http://code.elgg.org/elgg/trunk@3717 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/search/views/default/search/listing.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php index a747f43e5..c650d0e53 100644 --- a/mod/search/views/default/search/listing.php +++ b/mod/search/views/default/search/listing.php @@ -41,12 +41,22 @@ if (array_key_exists('pagination', $vars) && $vars['pagination']) { $nav = ''; } -// figure out what we're deal with. +// figure out what we're dealing with. +$type_str = NULL; + if (array_key_exists('type', $vars['params']) && array_key_exists('subtype', $vars['params'])) { - $type_str = elgg_echo("item:{$vars['params']['type']}:{$vars['params']['subtype']}"); -} elseif (array_key_exists('type', $vars['params'])) { + $type_str_tmp = "item:{$vars['params']['type']}:{$vars['params']['subtype']}"; + $type_str_echoed = elgg_echo($type_str_tmp); + if ($type_str_echoed != $type_str_tmp) { + $type_str = $type_str_echoed; + } +} + +if (!$type_str && array_key_exists('type', $vars['params'])) { $type_str = elgg_echo("item:{$vars['params']['type']}"); -} else { +} + +if (!$type_str) { $type_str = elgg_echo('search:unknown_entity'); } |