Version 4.7.13
This commit is contained in:
1 parent
fd22d99e69
commit
7124a02564
954 files changed
+29277
-59308
No files matched your search
@@ -922,7 +922,7 @@ class _Query extends \IPS\Content\Search\Query
|
||||
/* Now, if we have 501 results, then we have to assume there are more, so the join is required */
|
||||
if ( \count( $tagIds ) == 501 )
|
||||
{
|
||||
$tagWhere = array( $itemsOnlyTagSearch . 'index_item_index_id IN ( ? )', \IPS\Db::i()->select( 'index_id', 'core_search_index_tags', array( \IPS\Db::i()->in( 'index_tag', $tags ) ) ) );
|
||||
$tagWhere = array( $itemsOnlyTagSearch . 'index_item_index_id IN (' . \IPS\Db::i()->select( 'index_id', 'core_search_index_tags', array( \IPS\Db::i()->in( 'index_tag', $tags ) ) ) . ')' );
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1031,7 +1031,7 @@ class _Query extends \IPS\Content\Search\Query
|
||||
$where[] = $clause;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Return */
|
||||
return $where;
|
||||
}
|
||||
@@ -1101,7 +1101,7 @@ class _Query extends \IPS\Content\Search\Query
|
||||
search which is actually very efficient as MySQL performs a search on the FT index first to narrow down the results */
|
||||
if ( static::termIsPhrase( $term ) )
|
||||
{
|
||||
$term = str_replace( array( "'", '"' ), '', $term );
|
||||
$term = str_replace( array( "'", '"', '?' ), '', $term );
|
||||
|
||||
foreach ( static::termAsWordsArray( $term ) as $word )
|
||||
{
|
||||
@@ -1161,6 +1161,9 @@ class _Query extends \IPS\Content\Search\Query
|
||||
|
||||
/* Trailing + or -s are not allowed */
|
||||
$word = rtrim( $word, '+-' );
|
||||
|
||||
/* ? are not allowed either */
|
||||
$word = str_replace( '?', '', $word );
|
||||
|
||||
/* These rules only apply if we're not in a quoted phrase... */
|
||||
if ( !static::termIsPhrase( $word ) )
|
||||
|
||||
Reference in new issue
Block a user