aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--languages/en.php2
-rw-r--r--mod/search/index.php6
-rw-r--r--mod/search/start.php8
-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