php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Remove $p == 1 search wildcard requirement (#309)

Browse Source 
The bug meant to be fixed in https://github.com/s9y/Serendipity/commit/51208e0f726cfc3a7b65360be6a58a5fcd1c3968#diff-cbbd600f627a5af39c73092fbc3fbf46 is not reproducible anymore
This commit is contained in:
onli
2015-03-07 11:55:37 +01:00
parent 811af79b16
commit 75397c7d47
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_entries.inc.php
+2 -5
View File
@@ -873,13 +873,10 @@ function &serendipity_searchEntries($term, $limit = '', $searchresults = '') {
}
$search = array_merge($searchresults, $search);
}
$p = (int)$serendipity['GET']['page'];
if ($p == 0) $p = 1;
//if * wasn't already appended and if there are none or not enough
//results, search again for entries containing the searchterm as a part
if ($p == 1 && strpos($term, '*') === false && $serendipity['dbType'] != 'sqlite' && $serendipity['dbType'] != 'sqlite3' && $serendipity['dbType'] != 'pdo-sqlite' && $serendipity['dbType'] != 'sqlite3oo') {
if (strpos($term, '*') === false && $serendipity['dbType'] != 'sqlite' && $serendipity['dbType'] != 'sqlite3' && $serendipity['dbType'] != 'pdo-sqlite' && $serendipity['dbType'] != 'sqlite3oo') {
if (! is_array($search)) {
return serendipity_searchEntries($term.'*', $orig_limit);
} else {