diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-07 02:43:24 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-07 02:43:24 +0000 |
| commit | 1db7dba6a8a12b9066fb01f56054c0c637242076 (patch) | |
| tree | 09fb881083935d254d72a2c834d1a6f1a9429b6a | |
| parent | ccca9564b23d6f860d46ccdb86a7578e74b7a534 (diff) | |
| download | elgg-1db7dba6a8a12b9066fb01f56054c0c637242076.tar.gz elgg-1db7dba6a8a12b9066fb01f56054c0c637242076.tar.bz2 | |
Fixes 2354 Using list instead of listing for search now
git-svn-id: http://code.elgg.org/elgg/trunk@8058 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | languages/en.php | 2 | ||||
| -rw-r--r-- | mod/search/index.php | 6 | ||||
| -rw-r--r-- | mod/search/start.php | 8 | ||||
| -rw-r--r-- | mod/search/views/default/search/list.php (renamed from mod/search/views/default/search/listing.php) | 0 |
4 files changed, 8 insertions, 8 deletions
diff --git a/languages/en.php b/languages/en.php index db0811b60..2dd61751e 100644 --- a/languages/en.php +++ b/languages/en.php @@ -430,7 +430,7 @@ $english = array( 'next' => "Next", 'previous' => "Previous", - 'viewtype:change' => "Change listing type", + 'viewtype:change' => "Change list type", 'viewtype:list' => "List view", 'viewtype:gallery' => "Gallery", diff --git a/mod/search/index.php b/mod/search/index.php index db2aa5cc2..c51b0fe0d 100644 --- a/mod/search/index.php +++ b/mod/search/index.php @@ -187,7 +187,7 @@ if ($search_type == 'all' || $search_type == 'entities') { } if (is_array($results['entities']) && $results['count']) { - if ($view = search_get_search_view($current_params, 'listing')) { + if ($view = search_get_search_view($current_params, 'list')) { $results_html .= elgg_view($view, array( 'results' => $results, 'params' => $current_params, @@ -208,7 +208,7 @@ if ($search_type == 'all' || $search_type == 'entities') { } if (is_array($results['entities']) && $results['count']) { - if ($view = search_get_search_view($current_params, 'listing')) { + if ($view = search_get_search_view($current_params, 'list')) { $results_html .= elgg_view($view, array( 'results' => $results, 'params' => $current_params, @@ -239,7 +239,7 @@ if ($search_type != 'entities' || $search_type == 'all') { } if (is_array($results['entities']) && $results['count']) { - if ($view = search_get_search_view($current_params, 'listing')) { + if ($view = search_get_search_view($current_params, 'list')) { $results_html .= elgg_view($view, array( 'results' => $results, 'params' => $current_params, diff --git a/mod/search/start.php b/mod/search/start.php index 71473632c..4f57a64c5 100644 --- a/mod/search/start.php +++ b/mod/search/start.php @@ -326,12 +326,12 @@ function search_remove_ignored_words($query, $format = 'array') { * * @param array $results * @param array $params - * @param string $view_type = listing, entity or layout + * @param string $view_type = list, entity or layout * @return string */ function search_get_search_view($params, $view_type) { switch ($view_type) { - case 'listing': + case 'list': case 'entity': case 'layout': break; @@ -342,7 +342,7 @@ function search_get_search_view($params, $view_type) { $view_order = array(); - // check if there's a special search listing view for this type:subtype + // check if there's a special search list view for this type:subtype if (isset($params['type']) && $params['type'] && isset($params['subtype']) && $params['subtype']) { $view_order[] = "search/{$params['type']}/{$params['subtype']}/$view_type"; } @@ -357,7 +357,7 @@ function search_get_search_view($params, $view_type) { $view_order[] = "search/{$params['search_type']}/$view_type"; } - // finally default to a search listing default + // finally default to a search list default $view_order[] = "search/$view_type"; foreach ($view_order as $view) { diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/list.php index 27916a363..27916a363 100644 --- a/mod/search/views/default/search/listing.php +++ b/mod/search/views/default/search/list.php |