[geeklog-cvs] geeklog: Merging (and documenting feature request #0000910)

[geeklog-cvs at lists.geeklog.net]

changeset 7452:3026a81e17b7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3026a81e17b7
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 18:26:27 2009 +0100
description:
Merging (and documenting feature request #0000910)

diffstat:

 public_html/docs/history        |  2 ++
 system/classes/search.class.php |  6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 42760e758229 -r 3026a81e17b7 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 18:22:52 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 18:26:27 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1b1:
+- Improved display of the "Sort by" and "Show n results" dropdowns on the
+  search results page (feature request #0000910) [Sami, LWC]
 - Fixed wrong path reported in case of a missing 'data' directory (reported by
   Markus Wollschläger) [Dirk]
 - When a plugin returns 0 items for the Admins Block, don't display that as
diff -r 42760e758229 -r 3026a81e17b7 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Nov 07 18:22:52 2009 +0100
+++ b/system/classes/search.class.php	Sat Nov 07 18:26:27 2009 +0100
@@ -482,14 +482,16 @@
         else if ($style == 'google')
         {
             $sort_uid = $this->_author == '' ? true : false;
+            $sort_date = empty($this->_dateStart) || empty($this->_dateEnd) || $this->_dateStart != $this->_dateEnd ? true : false;
+            $sort_type = $this->_type == 'all' ? true : false;
             $obj->setStyle('inline');
             $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
             $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
             $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
             $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
             $obj->setField($LANG09[18], 'uid',          $show_user, $sort_uid,  $LANG01[104].' %s ');
-            $obj->setField($LANG09[17], 'date',         true,       true,  $LANG01[36].' %s');
-            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, true,  ' - %s');
+            $obj->setField($LANG09[17], 'date',         true,       $sort_date,  $LANG01[36].' %s');
+            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, $sort_type,  ' - %s');
             $obj->setField($LANG09[50], 'hits',         $show_hits, true,  ' - %s '.$LANG09[50]);
             $obj->setField('',          '_html',        true,       false, '</span>');
             $this->_wordlength = 50;