Fixed syntax for regex searches for newer MySQL.

shannah · May 22, 2023 · 8c9eb40 · 8c9eb40
1 parent 1b72598
commit 8c9eb40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Dataface/QueryBuilder.php b/Dataface/QueryBuilder.php
@@ -708,7 +708,7 @@ function _fieldWhereClause(&$field, $value, &$use_where, $tableAlias=null){
                                         $oldval = trim($value);
 					$value = $this->prepareValue( $key, $table->parse($key, $value), true );
 					if ( $repeat ){
-						$where .= $this->wc($tableAlias, $key, $collate)." NOT RLIKE CONCAT('[[:<:]]',$value,'[[:>:]]') AND ";
+						$where .= $this->wc($tableAlias, $key, $collate)." NOT REGEXP CONCAT('\\b',$value,'\\b') AND ";
 					} else {
                                                 $oper = '<>';
                                                 if (  strlen($oldval) === 0 ){
@@ -775,7 +775,7 @@ function _fieldWhereClause(&$field, $value, &$use_where, $tableAlias=null){
 
 				} else if ( $repeat ){
 					$value = $this->prepareValue( $key, $table->parse($key, $value), true);
-					$where .= $this->wc($tableAlias, $key, $collate)." RLIKE CONCAT('[[:<:]]',$value,'[[:>:]]') AND ";
+					$where .= $this->wc($tableAlias, $key, $collate)." REGEXP CONCAT('\\b',$value,'\\b') AND ";
 				}
 
 				else if ( $this->_exactMatches || preg_match( '/int|decimal/i', $field['Type']) || $exact ){

diff --git a/xf/db/drivers/mysqli.php b/xf/db/drivers/mysqli.php
@@ -12,10 +12,7 @@ function xf_db_connect($host,$user,$pass){
 function xf_db_connect_errno(){ return mysqli_connect_errno();}
 function xf_db_connect_error(){ return mysqli_connect_error();}
 function xf_db_query($sql, $conn=null){
-	if ($conn === null) {
-		$conn = df_db();
-	}
-	return mysqli_query($conn, $sql);
+	return mysqli_query($conn ?? df_db(), $sql);
 }
 function xf_db_error($link=null){
 	if ( $link === null ){