diff options
author | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:33:27 +0100 |
---|---|---|
committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:33:27 +0100 |
commit | 9fcb2ad0e435fdfeda5b147b3fee112b4cb89861 (patch) | |
tree | bbaa310e66f1b6463a498737658674cf1c0322ae /system/database/DB_result.php | |
parent | aa20f5b70f6da196d1a66d5dc17b05a037708e1a (diff) | |
parent | 1d571971be8be78a92d31aad27dda4009770043f (diff) |
merged latest develop branch, fixed changelog conflict.
Diffstat (limited to 'system/database/DB_result.php')
-rw-r--r-- | system/database/DB_result.php | 6 |
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. * |