summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-05-04 10:44:22 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-05-04 10:44:22 +0200
commit168b3de75cd7161308eab89576df5353e40bae76 (patch)
tree62abdeaf95221935761ea890468ecb093e6831a8
parent5ed585bb93bd93fadf3b51bc2ccc26433015d1d4 (diff)
Reverted partial MySQL driver change which double-escaped some fields.
-rw-r--r--system/database/drivers/mysql/mysql_driver.php6
-rw-r--r--user_guide/changelog.html1
2 files changed, 3 insertions, 4 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index c4691ba0b..4ff9b0a11 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -532,7 +532,7 @@ class CI_DB_mysql_driver extends CI_DB {
*/
function _insert($table, $keys, $values)
{
- return "INSERT INTO ".$table." (`".implode('`, `', $keys)."`) VALUES (".implode(', ', $values).")";
+ return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")";
}
// --------------------------------------------------------------------
@@ -551,7 +551,7 @@ class CI_DB_mysql_driver extends CI_DB {
*/
function _replace($table, $keys, $values)
{
- return "REPLACE INTO ".$table." (`".implode('`, `', $keys)."`) VALUES (".implode(', ', $values).")";
+ return "REPLACE INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")";
}
// --------------------------------------------------------------------
@@ -569,7 +569,7 @@ class CI_DB_mysql_driver extends CI_DB {
*/
function _insert_batch($table, $keys, $values)
{
- return "INSERT INTO ".$table." (`".implode('`, `', $keys)."`) VALUES ".implode(', ', $values);
+ return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values);
}
// --------------------------------------------------------------------
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c22414d16..26e9bbc3b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -128,7 +128,6 @@ Hg Tag: v2.0.1</p>
<li class="reactor">Fixed issue #41: Added audio/mp3 mime type to mp3.</li>
<li class="reactor">Fixed a bug (Core #329) where the file caching driver referenced the incorrect cache directory.</li>
<li class="reactor">Fixed a bug (Reactor #69) where the SHA1 library was named incorrectly.</li>
- <li class="reactor">MySQL Driver will now wrap field names for <kbd>insert()</kbd>, <kbd>update()</kbd> and <kbd>replace()</kbd> with backticks (`) so fields like "default" and "order" will not cause SQL errors.</li>
</ul>
<h2>Version 2.0.0</h2>