diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-12-11 23:20:50 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-12-11 23:20:50 +0100 |
| commit | c1ee5a02e6bac4547e5b52e1dba4d39285fafe87 (patch) | |
| tree | 3f728f79cf7bde0bcf287282451ba72b534f478b /system/database/drivers | |
| parent | 9c5c490bdc61ebd27593577480ec484f0b0f6367 (diff) | |
| parent | 0433431188b9e71841ae292cb218ca89ded58b87 (diff) | |
Merge pull request #2761 from a-krebs/2.1-stable
Make oci_execute() calls inside num_rows() non-committing. Fixes #696.
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/oci8/oci8_result.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 3421278a5..f6138c014 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -43,11 +43,11 @@ class CI_DB_oci8_result extends CI_DB_result { if ($this->num_rows === 0 && count($this->result_array()) > 0) { $this->num_rows = count($this->result_array()); - @oci_execute($this->stmt_id); + @oci_execute($this->stmt_id, OCI_DEFAULT); if ($this->curs_id) { - @oci_execute($this->curs_id); + @oci_execute($this->curs_id, OCI_DEFAULT); } } |