diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-07-27 20:54:41 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-07-27 20:54:41 +0200 |
| commit | f7631f18d65eaf7f2b3aa5ee603e84008a681ffc (patch) | |
| tree | b8d6ed9063abb341e30e12ad3359a3d4e52268e5 /system | |
| parent | 2dfbe9997b28892342e826e9350a466e6bacfd2e (diff) | |
Revert "Fix an internal bug in QB where() escaping"
This reverts commit 43afc71b777b00cfc2638add6fa3c47d333c5e04.
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_query_builder.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index da8820421..6ea7841e3 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -657,7 +657,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver { if ($v !== NULL) { - $v = ' '.$this->escape($v); + if ($escape === TRUE) + { + $v = ' '.$this->escape($v); + } if ( ! $this->_has_operator($k)) { |