Rename property _commit to commit_mode and merge upstream changes
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index ff6f7a4..9ac96fc 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -39,15 +39,23 @@
public $stmt_id;
public $curs_id;
public $limit_used;
-
- // This will be changed by CI_DB_driver, but it's good to have a default:
- public $commit_mode = OCI_DEFAULT;
+ public $commit_mode;
/* Overwriting the parent here, so we have a way to know if it's
* already called or not:
*/
public $num_rows;
+ public function __construct(&$driver_object)
+ {
+ parent::__construct($driver_object);
+ $this->stmt_id = $driver_object->stmt_id;
+ $this->curs_id = $driver_object->curs_id;
+ $this->limit_used = $driver_object->limit_used;
+ $this->commit_mode =& $driver_object->commit_mode;
+ $driver_object->stmt_id = FALSE;
+ }
+
/**
* Number of rows in the result set.
*