diff options
| -rw-r--r-- | system/database/DB_active_rec.php | 20 | ||||
| -rw-r--r-- | system/database/DB_driver.php | 22 | ||||
| -rw-r--r-- | user_guide/changelog.html | 3 |
3 files changed, 24 insertions, 21 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
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2188c1203..5fa7c60a3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -64,7 +64,7 @@ SVN Revision: not currently released</p> <li>Database
<ul>
<li>Added ability to set additional database config values in <a href="database/connecting.html">DSN connections</a> via the query string.</li>
- </ul>
+ </ul>
</li>
<li>Libraries
<ul>
@@ -85,6 +85,7 @@ SVN Revision: not currently released</p> <ul>
<li>Amended fixes for bug (#3419) with parsing DSN database connections.</li>
+ <li>Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.</li>
<li>Fixed a syntax error in upload_lang.php.</li>
<li>Fixed a bug (#4542) with a regular expression in the Image library.</li>
</ul>
|