[geeklog-cvs] Geeklog-1.x/system/classes search.class.php, 1.66, 1.67

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv15217/system/classes

Modified Files:
	search.class.php 
Log Message:
Provide nicer URLs to story search results when URL rewriting is enabled (bug #0000665)


Index: search.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** search.class.php	11 May 2008 07:25:08 -0000	1.66
--- search.class.php	20 Jul 2008 17:17:09 -0000	1.67
***************
*** 304,313 ****
                  $A['title'] = str_replace ('$', '$', $A['title']);
                  $thetime = COM_getUserDateTimeFormat ($A['day']);
!                 if (empty($this->_query)) {
!                     $articleUrl = COM_buildUrl($_CONF['site_url']
!                                     . '/article.php?story=' . $A['sid']);
!                 } else {
!                     $articleUrl = $_CONF['site_url'] . '/article.php?story='
!                         . $A['sid'] . '&query=' . urlencode($this->_query);
                  }
                  $author = htmlspecialchars($this->_displayName($A['username'],
--- 304,312 ----
                  $A['title'] = str_replace ('$', '$', $A['title']);
                  $thetime = COM_getUserDateTimeFormat ($A['day']);
!                 $articleUrl = COM_buildUrl($_CONF['site_url']
!                                            . '/article.php?story=' . $A['sid']);
!                 if (!empty($this->_query)) {
!                     $articleUrl .= (strpos($articleUrl, '?') ? '&' : '?')
!                                 . 'query=' . urlencode($this->_query);
                  }
                  $author = htmlspecialchars($this->_displayName($A['username'],