summaryrefslogtreecommitdiffstats
path: root/system/database/DB_result.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-05 15:17:32 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-05 15:17:32 +0100
commit99013ed3ed0ea5641a6c6b6afa08a7befb579cb0 (patch)
treeec85d2c3b418d87366d88f9efc96c03bfa839fdb /system/database/DB_result.php
parent62d6ee48b319dc7ec92b4a14fa8dbd3601060544 (diff)
parent57bdeb61bf199d1ae3ceaede4e9a9af8290ce715 (diff)
Rename property _commit to commit_mode and merge upstream changes
Diffstat (limited to 'system/database/DB_result.php')
-rw-r--r--system/database/DB_result.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 730443222..61aa56121 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -47,6 +47,12 @@ class CI_DB_result {
public $num_rows = 0;
public $row_data = NULL;
+ public function __construct(&$driver_object)
+ {
+ $this->conn_id = $driver_object->conn_id;
+ $this->result_id = $driver_object->result_id;
+ }
+
/**
* Query result. Acts as a wrapper function for the following functions.
*