Moved the _has_operators() function into DB_driver from DB_active_rec.

2 files changed, 22 insertions, 20 deletions

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 3cb39822c..dcf9d3868 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1394,27 +1394,7 @@ class CI_DB_active_record extends CI_DB_driver {
 	{

 		return $this->from($table);

 	}

-	

-	// --------------------------------------------------------------------

-

-	/**

-	 * Tests whether the string has an SQL operator

-	 *

-	 * @access	private

-	 * @param	string

-	 * @return	bool

-	 */

-	function _has_operator($str)

-	{

-		$str = trim($str);

-		if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str))

-		{

-			return FALSE;

-		}

 

-		return TRUE;

-	}

-	

 	// --------------------------------------------------------------------

 

 	/**

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index eeaf6ea78..60f51d757 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -933,7 +933,9 @@ class CI_DB_driver {
 	function update_string($table, $data, $where)

 	{

 		if ($where == '')

+		{

 			return false;

+		}

 					

 		$fields = array();

 		foreach($data as $key => $val)

@@ -972,6 +974,26 @@ class CI_DB_driver {
 	// --------------------------------------------------------------------

 

 	/**

+	 * Tests whether the string has an SQL operator

+	 *

+	 * @access	private

+	 * @param	string

+	 * @return	bool

+	 */

+	function _has_operator($str)

+	{

+		$str = trim($str);

+		if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str))

+		{

+			return FALSE;

+		}

+

+		return TRUE;

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

 	 * Prep the table name - simply adds the table prefix if needed

 	 *

 	 * @access	public