summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-04-24 20:55:50 +0200
committerTimothy Warren <tim@timshomepage.net>2012-04-24 20:55:50 +0200
commit8b9f059c07e2e7afa94390b46888cf7784575eeb (patch)
tree87e0190ff6a06ff34f54adb9bdc7febbb7173f62 /system
parent48a7fbbeb53e82e9298036d40c42ec2564699ed0 (diff)
parente7bbb1dc97c6f2027db5f24383f8d93c4ba41d82 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'system')
-rw-r--r--system/database/drivers/sqlsrv/sqlsrv_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
index 951567033..c318f3060 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_driver.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -440,7 +440,7 @@ class CI_DB_sqlsrv_driver extends CI_DB {
$where .= ($where === '' ? ' WHERE ' : ' AND ').implode(' ', $like);
}
- return 'UPDATE '.$table.' SET '.implode(', ', $valstr).' WHERE '.$where;
+ return 'UPDATE '.$table.' SET '.implode(', ', $valstr).$where;
}
// --------------------------------------------------------------------