[geeklog-hg] geeklog: Searching for "more from topic" also didn't work anymor...

[geeklog-cvs at lists.geeklog.net]

changeset 8989:4a907add157e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/4a907add157e
user: Dirk Haun <dirk at haun-online.de>
date: Sat Mar 09 22:11:20 2013 +0100
description:
Searching for "more from topic" also didn't work anymore; related issues: #0001565, #0001518

diffstat:

 system/classes/search.class.php |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (18 lines):

diff -r 80437d297457 -r 4a907add157e system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Mar 09 17:57:00 2013 +0900
+++ b/system/classes/search.class.php	Sat Mar 09 22:11:20 2013 +0100
@@ -430,10 +430,10 @@
             return SEC_loginRequiredForm();
         }
 
-        // Make sure there is a query string or author not all (to allow finding all posts of author)
-        // Full text searches have a minimum word length of 3 by default
-        if ((trim($this->_query) === '' && $this->_author === '') ||
-                (empty($this->_query) && empty($this->_author) && empty($this->_topic)) ||
+        // When full text searches are enabled, make sure the min. query length
+        // is 3 characters. Otherwise, make sure at least one of query string,
+        // author, or topic is not empty.
+        if ((empty($this->_query) && empty($this->_author) && empty($this->_topic)) ||
                 ($_CONF['search_use_fulltext'] && strlen($this->_query) < 3))
         {
             $retval = '<p>' . $LANG09[41] . '</p>' . LB;