Merging (and documenting feature request #0000910) HEAD
authorDirk Haun <dirk@haun-online.de>
Sat Nov 07 18:26:27 2009 +0100 (2009-11-07)
branchHEAD
changeset 74523026a81e17b7
parent 7451 42760e758229
parent 7449 ad0616900bdb
child 7453 825540f1937d
Merging (and documenting feature request #0000910)
public_html/docs/history
     1.1 --- a/public_html/docs/history	Sat Nov 07 18:22:52 2009 +0100
     1.2 +++ b/public_html/docs/history	Sat Nov 07 18:26:27 2009 +0100
     1.3 @@ -4,6 +4,8 @@
     1.4  ------------
     1.5  
     1.6  Changes since 1.6.1b1:
     1.7 +- Improved display of the "Sort by" and "Show n results" dropdowns on the
     1.8 +  search results page (feature request #0000910) [Sami, LWC]
     1.9  - Fixed wrong path reported in case of a missing 'data' directory (reported by
    1.10    Markus Wollschläger) [Dirk]
    1.11  - When a plugin returns 0 items for the Admins Block, don't display that as
     2.1 --- a/system/classes/search.class.php	Sat Nov 07 18:22:52 2009 +0100
     2.2 +++ b/system/classes/search.class.php	Sat Nov 07 18:26:27 2009 +0100
     2.3 @@ -482,14 +482,16 @@
     2.4          else if ($style == 'google')
     2.5          {
     2.6              $sort_uid = $this->_author == '' ? true : false;
     2.7 +            $sort_date = empty($this->_dateStart) || empty($this->_dateEnd) || $this->_dateStart != $this->_dateEnd ? true : false;
     2.8 +            $sort_type = $this->_type == 'all' ? true : false;
     2.9              $obj->setStyle('inline');
    2.10              $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
    2.11              $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
    2.12              $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
    2.13              $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
    2.14              $obj->setField($LANG09[18], 'uid',          $show_user, $sort_uid,  $LANG01[104].' %s ');
    2.15 -            $obj->setField($LANG09[17], 'date',         true,       true,  $LANG01[36].' %s');
    2.16 -            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, true,  ' - %s');
    2.17 +            $obj->setField($LANG09[17], 'date',         true,       $sort_date,  $LANG01[36].' %s');
    2.18 +            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, $sort_type,  ' - %s');
    2.19              $obj->setField($LANG09[50], 'hits',         $show_hits, true,  ' - %s '.$LANG09[50]);
    2.20              $obj->setField('',          '_html',        true,       false, '</span>');
    2.21              $this->_wordlength = 50;