[xoops-svn] SF.net SVN: xoops-svn:[10369] XoopsCore/branches/2.6.x/2.6.0/htdocs/search. php

[<du...@us...>]

Revision: 10369
          http://sourceforge.net/p/xoops/svn/10369
Author:   dugris
Date:     2012-12-12 12:59:08 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fix search

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php	2012-12-12 12:38:22 UTC (rev 10368)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php	2012-12-12 12:59:08 UTC (rev 10369)
@@ -187,7 +187,7 @@
                         }
                         $res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
                         $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
-                        if ( !empty($results[$i]['uid']) ) {
+                        if ( !empty($results[$i]['uid']) ) {
                             $res[$i]['uid'] = intval($results[$i]['uid']);
                             $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
                         }
@@ -250,9 +250,15 @@
                     $res[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
                 }
                 $res[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
-                $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
-                $res[$i]['uid'] = @intval($results[$i]['uid']);
-                $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+                if (isset($queries_pattern)) {
+                    $res[$i]['title_highligh'] = preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlspecialchars($results[$i]['title']));
+                } else {
+                    $res[$i]['title_highligh'] = $myts->htmlspecialchars($results[$i]['title']);
+                }
+                if ( !empty($results[$i]['uid']) ) {
+                    $res[$i]['uid'] = @intval($results[$i]['uid']);
+                    $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+                }
                 $res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocal::formatTimestamp(intval($results[$i]['time'])) . ")" : "";
                 $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace( $queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
             }