[geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.14,1.15

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

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

Modified Files:
	search.class.php 
Log Message:
Fixed Additional locations where $_CONF['site_url'] was not being used. Poll search and comment search results

Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** search.class.php	31 Aug 2003 17:20:33 -0000	1.14
--- search.class.php	31 Aug 2003 17:26:55 -0000	1.15
***************
*** 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="' .$_CONF['site_url'] .'/'. $articleUrl . '">' . stripslashes($A['title']) . 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="' .$_CONF['site_url'] . $articleUrl . '">' . stripslashes($A['title']) . DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;
***************
*** 397,403 ****
                  }
                  if ($A['comment_type'] == 'article') {
!                     $A['title'] = '<a href="article.php?story=' . $A['sid'] . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  } else {
!                     $A['title'] = '<a href="pollbooth.php?qid=' . $A['qid'] . '&aid=-1' . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  }
                  
--- 397,403 ----
                  }
                  if ($A['comment_type'] == 'article') {
!                     $A['title'] = '<a href="' .$_CONF['site_url'] .'/article.php?story=' . $A['sid'] . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  } else {
!                     $A['title'] = '<a href="' .$_CONF['site_url'] .'/pollbooth.php?qid=' . $A['qid'] . '&aid=-1' . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  }