[geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.10,1.11

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv24680

Modified Files:
	search.class.php 
Log Message:
For empty queries, don't add '&query=' in the url to the actual article.


Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** search.class.php	24 Jul 2003 21:09:45 -0000	1.10
--- search.class.php	25 Jul 2003 10:53:34 -0000	1.11
***************
*** 293,297 ****
                      $A['title'] = str_replace('$','$',$A['title']);
                      $thetime = COM_getUserDateTimeFormat($A['day']);
!                     $row = array('<a href="article.php?story=' . $A['sid'] . '&query=' . $urlQuery . '">' . stripslashes($A['title']) . '</a>',$thetime[0], DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;
--- 293,301 ----
                      $A['title'] = str_replace('$','$',$A['title']);
                      $thetime = COM_getUserDateTimeFormat($A['day']);
!                     $articleUrl = 'article.php?story=' . $A['sid'];
!                     if (!empty ($urlQuery)) {
!                         $articleUrl .= '&query=' . $urlQuery;
!                     }
!                     $row = array('<a href="' . $articleUrl . '">' . stripslashes($A['title']) . '</a>',$thetime[0], DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;