From fc5ef85ec2fa45afb44795109899d93329f7b2c4 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Apr 2010 01:56:18 +0000 Subject: Merged [5623]:head from 1.7 to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@5760 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/search/search_hooks.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'mod/search/search_hooks.php') diff --git a/mod/search/search_hooks.php b/mod/search/search_hooks.php index 1af208d6e..a2063dbc1 100644 --- a/mod/search/search_hooks.php +++ b/mod/search/search_hooks.php @@ -240,8 +240,21 @@ function search_tags_hook($hook, $type, $value, $params) { } } + // different entities have different titles + switch($entity->type) { + case 'site': + case 'user': + case 'group': + $title_tmp = $entity->name; + break; + + case 'object': + $title_tmp = $entity->title; + break; + } + // Nick told me my idea was dirty, so I'm hard coding the numbers. - $title_tmp = strip_tags($entity->title); + $title_tmp = strip_tags($title_tmp); if (elgg_strlen($title_tmp) > 297) { $title_str = elgg_substr($title_tmp, 0, 297) . '...'; } else { @@ -257,7 +270,6 @@ function search_tags_hook($hook, $type, $value, $params) { $tags_str = implode('. ', $matched_tags_strs); $tags_str = search_get_highlighted_relevant_substrings($tags_str, $params['query']); - //$tags_str = "($tags_str)"; $entity->setVolatileData('search_matched_title', $title_str); $entity->setVolatileData('search_matched_description', $desc_str); @@ -392,4 +404,4 @@ function search_comments_hook($hook, $type, $value, $params) { function search_custom_types_comments_hook($hook, $type, $value, $params) { $value[] = 'comments'; return $value; -} \ No newline at end of file +} -- cgit v1.2.3