diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-07-05 15:31:12 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-07-05 15:31:12 +0200 |
| commit | 92d18a7b6c46eadc9db58ca60ffce3980e2313ff (patch) | |
| tree | b0a869a5312279d65c3e920ffbf0b32344ab1d0f /system/database/drivers/postgre/postgre_result.php | |
| parent | d66872ae5d7cd4d2b531251a9c63528e81af3322 (diff) | |
| parent | 7ca36131d881d3f83a86d824263d4abd65439e12 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/postgre/postgre_result.php')
| -rw-r--r-- | system/database/drivers/postgre/postgre_result.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index f913bc9eb..515acd20f 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -33,6 +33,7 @@ * @category Database * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/database/ + * @since 1.3 */ class CI_DB_postgre_result extends CI_DB_result { @@ -43,7 +44,9 @@ class CI_DB_postgre_result extends CI_DB_result { */ public function num_rows() { - return @pg_num_rows($this->result_id); + return is_int($this->num_rows) + ? $this->num_rows + : $this->num_rows = @pg_num_rows($this->result_id); } // -------------------------------------------------------------------- |