diff options
| author | Andrey Andreev <narf@devilix.net> | 2019-06-19 15:27:50 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2019-06-19 15:27:50 +0200 |
| commit | 10e70f02a5b0e3beb371e64374c0008d7bfdec49 (patch) | |
| tree | e2979f2b78bac8093a02d96f59a40023db53e6d2 | |
| parent | 590a844b9219670b08f88d023d8be95117de8da1 (diff) | |
Fix #5774
| -rw-r--r-- | system/database/DB_result.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 0dbac1633..ed5252d49 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -381,7 +381,7 @@ class CI_DB_result { */ public function custom_row_object($n, $type) { - isset($this->custom_result_object[$type]) OR $this->custom_result_object($type); + isset($this->custom_result_object[$type]) OR $this->custom_result_object[$type] = $this->custom_result_object($type); if (count($this->custom_result_object[$type]) === 0) { diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 9df65756d..b64b8154a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -24,6 +24,7 @@ Bug fixes for 3.1.11 - Fixed a bug (#5755) - :doc:`Form Validation Library <libraries/form_validation>` rule **valid_url** accepted digit-only domains due to a PHP bug. - Fixed a bug (#5753) - :doc:`Cache Library <libraries/caching>` 'redis' driver methods ``increment()``, ``decrement()`` ignored their ``$offset`` parameter. - Fixed a bug (#5779) - :doc:`Session Library <libraries/session>` 'redis' only attempted to validate session IDs in case the connection to Redis failed. +- Fixed a bug (#5774) - :doc:`Database Results <database/results>` method ``custom_result_object()`` didn't properly handle empty result sets, triggering ``E_WARNING`` messages on PHP 7.2+. Version 3.1.10 ============== |