[geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.26,1.27

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system/classes
In directory www:/tmp/cvs-serv13863/system/classes

Modified Files:
	search.class.php 
Log Message:
Found a few more places where we did not properly use the article URL when URL rewriting is on.


Index: search.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** search.class.php	13 Aug 2004 16:53:47 -0000	1.26
--- search.class.php	23 Aug 2004 12:38:53 -0000	1.27
***************
*** 304,314 ****
                      $A['title'] = str_replace('$','$',$A['title']);
                      $thetime = COM_getUserDateTimeFormat($A['day']);
!                     $articleUrl = '/article.php?story=' . $A['sid'];
!                     if (!empty ($urlQuery)) {
!                         $articleUrl .= '&query=' . urlencode($urlQuery);
                      }
!                     $row = array ('<a href="' . $_CONF['site_url']
!                             . $articleUrl . '">' . stripslashes ($A['title'])
!                             . '</a>', $thetime[0],
                              DB_getItem ($_TABLES['users'], 'username',
                              "uid = '{$A['uid']}'"), $A['hits']);
--- 304,316 ----
                      $A['title'] = str_replace('$','$',$A['title']);
                      $thetime = COM_getUserDateTimeFormat($A['day']);
!                     if (empty ($urlQuery)) {
!                         $articleUrl = COM_buildUrl ($_CONF['site_url']
!                                         . '/article.php?story=' . $A['sid']);
!                     } else {
!                         $articleUrl = $_CONF['site_url'] . '/article.php?story='
!                             . $A['sid'] . '&query=' . urlencode ($urlQuery);
                      }
!                     $row = array ('<a href="' . $articleUrl . '">'
!                             . stripslashes ($A['title']) . '</a>', $thetime[0],
                              DB_getItem ($_TABLES['users'], 'username',
                              "uid = '{$A['uid']}'"), $A['hits']);
***************
*** 413,425 ****
                      $querystring = '';
                  }
!                 $A['title'] = '<a href="' . $_CONF['site_url'] . '/comment.php?mode=view&cid=' . $A['cid'] . '">' . stripslashes ($A['title']) . '</a>';
!                 /*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>';
!                 }*/
  
!                 $thetime = COM_getUserDateTimeFormat($A['day']);
!                 $row = array($A['title'], $thetime[0],DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"));
                  $comment_results->addSearchResult($row);
                  $comment_results->num_searchresults++;
--- 415,424 ----
                      $querystring = '';
                  }
!                 $A['title'] = '<a href="' . $_CONF['site_url']
!                             . '/comment.php?mode=view&cid=' . $A['cid']
!                             . '">' . stripslashes ($A['title']) . '</a>';
  
!                 $thetime = COM_getUserDateTimeFormat ($A['day']);
!                 $row = array ($A['title'], $thetime[0], DB_getItem ($_TABLES['users'], 'username', "uid = '{$A['uid']}'"));
                  $comment_results->addSearchResult($row);
                  $comment_results->num_searchresults++;