diff options
author | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:34:05 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-10-28 17:34:05 +0200 |
commit | 67b40a561111a5a65faa245cd4c575e8d945cfb8 (patch) | |
tree | 4c9d3c66d666f3a781299e11806a5ff1d11fc3ba /system/database/drivers/sqlite/sqlite_forge.php | |
parent | df34b547c97ba1ce1ddb819495d299cb845a87de (diff) | |
parent | 499c6080cd41927df088206155e4055d4da3e58e (diff) |
Merge branch '3.1-stable' into develop
Resolved conflicts:
system/core/CodeIgniter.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/form_validation.rst
Diffstat (limited to 'system/database/drivers/sqlite/sqlite_forge.php')
-rw-r--r-- | system/database/drivers/sqlite/sqlite_forge.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 8a1659430..3ad3477e4 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -75,7 +75,7 @@ class CI_DB_sqlite_forge extends CI_DB_forge { * @param string $db_name (ignored) * @return bool */ - public function create_database($db_name = '') + public function create_database($db_name) { // In SQLite, a database is created when you connect to the database. // We'll return TRUE so that an error isn't generated @@ -90,7 +90,7 @@ class CI_DB_sqlite_forge extends CI_DB_forge { * @param string $db_name (ignored) * @return bool */ - public function drop_database($db_name = '') + public function drop_database($db_name) { if ( ! file_exists($this->db->database) OR ! @unlink($this->db->database)) { |