diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:34:05 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:34:05 +0200 |
| commit | 67b40a561111a5a65faa245cd4c575e8d945cfb8 (patch) | |
| tree | 4c9d3c66d666f3a781299e11806a5ff1d11fc3ba /system/database/drivers/postgre | |
| parent | df34b547c97ba1ce1ddb819495d299cb845a87de (diff) | |
| parent | 499c6080cd41927df088206155e4055d4da3e58e (diff) | |
Merge branch '3.1-stable' into develop
Resolved conflicts:
system/core/CodeIgniter.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/form_validation.rst
Diffstat (limited to 'system/database/drivers/postgre')
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index ce21260ef..c7c827ea4 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -282,7 +282,7 @@ class CI_DB_postgre_driver extends CI_DB { */ public function is_write_type($sql) { - if (preg_match('#^(INSERT|UPDATE).*RETURNING\s.+(\,\s?.+)*$#i', $sql)) + if (preg_match('#^(INSERT|UPDATE).*RETURNING\s.+(\,\s?.+)*$#is', $sql)) { return FALSE; } |