summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-05 17:06:32 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-05 17:06:32 +0200
commit35c7adc7f3d3058a29b177dcaa888c67dd174613 (patch)
treed4ccdbd7e7aa4b7900463ad35dfdd96f7409853a /system/database
parent7ca36131d881d3f83a86d824263d4abd65439e12 (diff)
Apparently mysql_data_seek() causes problems even when we suppress and ignore it
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/mysql/mysql_result.php25
1 files changed, 21 insertions, 4 deletions
diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php
index b507f7960..a75cfad1f 100644
--- a/system/database/drivers/mysql/mysql_result.php
+++ b/system/database/drivers/mysql/mysql_result.php
@@ -38,15 +38,30 @@
class CI_DB_mysql_result extends CI_DB_result {
/**
+ * Constructor
+ *
+ * @param object
+ * @return void
+ */
+ public function __construct(&$driver_object)
+ {
+ parent::__construct($driver_object);
+
+ // Required, due to mysql_data_seek() causing nightmares
+ // with empty result sets
+ $this->num_rows = @mysql_num_rows($this->result_id);
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Number of rows in the result set
*
* @return int
*/
public function num_rows()
{
- return is_int($this->num_rows)
- ? $this->num_rows
- : $this->num_rows = @mysql_num_rows($this->result_id);
+ return $this->num_rows;
}
// --------------------------------------------------------------------
@@ -135,7 +150,9 @@ class CI_DB_mysql_result extends CI_DB_result {
*/
protected function _data_seek($n = 0)
{
- return @mysql_data_seek($this->result_id, $n);
+ return $this->num_rows
+ ? @mysql_data_seek($this->result_id, $n)
+ : FALSE;
}
// --------------------------------------------------------------------