Fixed displaying of ...s in search.

git-svn-id: http://code.elgg.org/elgg/trunk@3658 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/search/start.php b/mod/search/start.php
index 314aa4710fe7fe34e0f73010297a781e4cb70e14..19de06dd7f7ccf7ad546b61f113f1c7a08cc672c 100644 (file)
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -249,8 +249,12 @@ function search_get_highlighted_relevant_substrings($haystack, $needle, $min_mat
                }
                $string = substr($haystack, $offset, $limit - $offset);
 
-               if ($limit-$offset < strlen($haystack)) {
-                       $string = "$string...";
+               if ($offset != 0) {
+                       $string = "...$string";
+               }
+
+               if ($limit + $offset >= strlen($haystack)) {
+                       $string .= '...';
                }
 
                $substrings[] = $string;