Version 3.4.8

This commit is contained in:
Neo committed 2025-12-19 00:42:42 -08:00
1 parent b45ea0dffb
commit c603205a25
1398 files changed
+36675 -31023

No files matched your search

@@ -2,18 +2,18 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.6
* IP.Board v3.4.8
* Basic Forum Search
* Last Updated: $Date: 2013-05-21 20:51:17 -0400 (Tue, 21 May 2013) $
* Last Updated: $Date: 2014-11-11 15:53:26 -0500 (Tue, 11 Nov 2014) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: rashbrook $
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
* @license http://www.invisionpower.com/company/standards.php#license
* @package IP.Board
* @subpackage Forums
* @link http://www.invisionpower.com
* @version $Rev: 12263 $
* @version $Rev: 12568 $
*/
if ( ! defined( 'IN_IPB' ) )
@@ -167,7 +167,7 @@ class search_engine_forums extends search_engine
if ( ! IPSSearchRegistry::searchTitleOnly() )
{
/* Do the search */
$this->DB->build( array(
$o = $this->DB->build( array(
'select' => "p.{$this->table['pid']} as id, p.{$this->table['post_date']}, p.{$this->table['topic_id']}",
'from' => array( $this->table['_table_'] => 'p' ),
'where' => $this->_buildWhereStatement( $search_term, IPSSearchRegistry::searchTitleOnly(), '', null, ( IPSSearchRegistry::get('opt.searchType') == 'content' || IPSSearchRegistry::get('in.search_author') ) ? false : true ),
@@ -184,7 +184,7 @@ class search_engine_forums extends search_engine
IPSSearchRegistry::set('set.returnType', 'tids' );
/* Do the search */
$this->DB->build( array(
$o = $this->DB->build( array(
'select' => "t.tid as id, t.tid as topic_id, t.title, t.posts, t.views, t.last_post",
'from' => 'topics t',
'where' => str_replace( 'p.' . $this->table['author_id'], 't.starter_id', $this->_buildWhereStatement( $search_term, IPSSearchRegistry::searchTitleOnly() ) ),
@@ -192,7 +192,7 @@ class search_engine_forums extends search_engine
'order' => 't.'.$sortKey . ' ' . $sort_order ) );
}
$DB = $this->DB->execute();
$DB = $this->DB->execute( $o );
/* Fetch all to sort */
while( $r = $this->DB->fetch( $DB ) )
@@ -923,7 +923,7 @@ class search_engine_forums extends search_engine
$sortKey = '';
$sortType = '';
$cType = IPSSearchRegistry::get('contextual.type');
$cId = IPSSearchRegistry::get('contextual.id' );
$cId = intval( IPSSearchRegistry::get('contextual.id' ) );
$search_tags = IPSSearchRegistry::get('in.raw_search_tags');
/* Loop through the forums and build a list of forums we're allowed access to */
@@ -1082,7 +1082,7 @@ class search_engine_forums extends search_engine
if( $content_title_only )
{
$where_clause[] = $this->DB->buildSearchStatement( 't.title', $search_term, true, false, ipsRegistry::$settings['use_fulltext'] );
$where_clause[] = $this->DB->buildSearchStatement( 't.title', $search_term, true, false, ipsRegistry::$settings['use_fulltext'], ipsRegistry::$settings['s_andor_type'] );
IPSSearchRegistry::set('set.returnType', 'tids' );
}
@@ -1090,7 +1090,7 @@ class search_engine_forums extends search_engine
{
if ( $onlyPosts )
{
$where_clause[] = $this->DB->buildSearchStatement( 'p.' . $this->table['post'], $search_term, true, false, ipsRegistry::$settings['use_fulltext'] );
$where_clause[] = $this->DB->buildSearchStatement( 'p.' . $this->table['post'], $search_term, true, false, ipsRegistry::$settings['use_fulltext'], ipsRegistry::$settings['s_andor_type'] );
IPSSearchRegistry::set('set.returnType', 'pids' );
}
else