Version 3.4.8

upload/ips_kernel/classDbMysql.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * MySQL Database Driver :: Further loads mysql or mysqli client appropriately
- * Last Updated: $Date: 2012-09-17 11:58:03 -0400 (Mon, 17 Sep 2012) $
+ * Last Updated: $Date: 2014-11-11 15:53:26 -0500 (Tue, 11 Nov 2014) $
  * </pre>
  *
- * @author 		$Author: mark $
+ * @author 		$Author: rashbrook $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @subpackage	Kernel
  * @link		http://www.invisionpower.com
  * @since		Monday 28th February 2005 16:46
- * @version		$Revision: 11341 $
+ * @version		$Revision: 12568 $
  */
 
 /**
@@ -1086,13 +1086,27 @@ abstract class db_main_mysql extends dbMain
 	 * @param	boolean		Search in boolean mode
 	 * @param	boolean		Return a "as ranking" statement from the build
 	 * @param	boolean		Use fulltext search
+	 * @param	string		And or Or search? (for non-fulltext only)
 	 * @return	@e string
 	 */
-	public function buildSearchStatement( $column, $keyword, $booleanMode=true, $returnRanking=false, $useFulltext=true )
+	public function buildSearchStatement( $column, $keyword, $booleanMode=true, $returnRanking=false, $useFulltext=true, $addor = 'and' )
 	{
 		if( !$useFulltext OR strtolower($this->connect_vars['mysql_tbl_type']) != 'myisam' )
 		{
-			return "{$column} LIKE '%{$keyword}%'";
+			if ( stripos( $keyword, ' ' ) !== FALSE AND $addor == 'or' )
+			{
+				$where = array();
+				foreach( explode( ' ', $keyword ) AS $word )
+				{
+					$where[] = "{$column} LIKE '%{$word}%'";
+				}
+				
+				return "( " . implode( ' OR ', $where ) . " )";
+			}
+			else
+			{
+				return "{$column} LIKE '%{$keyword}%'";
+			}
 		}
 		else
 		{