summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-09-11 16:29:56 +0200
committerAndrey Andreev <narf@devilix.net>2018-09-11 16:29:56 +0200
commit89288a4ad3411b597eb1e7041660e912c611cfb0 (patch)
tree6a2a63179e949d9f09c0eff2e5272c500d08738e
parenta44257a9b34b235db3d54dc7ac579934683ebc25 (diff)
[ci skip] Fix #5587
-rw-r--r--system/database/DB_forge.php5
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 5 insertions, 1 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 152f8f651..4d23e4e7b 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -348,7 +348,10 @@ abstract class CI_DB_forge {
if (($result = $this->db->query($sql)) !== FALSE)
{
- isset($this->db->data_cache['table_names']) && $this->db->data_cache['table_names'][] = $table;
+ if (isset($this->db->data_cache['table_names']))
+ {
+ $this->db->data_cache['table_names'][] = $table;
+ }
// Most databases don't support creating indexes from within the CREATE TABLE statement
if ( ! empty($this->keys))
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index af32fe882..aa0eae7e0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -17,6 +17,7 @@ Bug fixes for 3.1.10
- Fixed a bug (#5561) - :doc:`Database Library <database/index>` didn't allow SSL connection configuration with only the 'ssl_verify' option when using the 'mysqli' driver.
- Fixed a bug (#5545) - :doc:`Session Library <libraries/sessions>` crashed due to a caching-related error with the 'files' driver.
- Fixed a bug (#5571) - :doc:`XML-RPC Library <libraries/xmlrpc>` had a typo that triggered an ``E_WARNING`` message on PHP 7.2.
+- Fixed a bug (#5587) - :doc:`Database Forge <database/forge>` method ``create_table()`` generated an ``E_WARNING`` message.
Version 3.1.9
=============