summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-02-05 14:31:08 +0100
committerAndrey Andreev <narf@devilix.net>2015-02-05 14:31:08 +0100
commit79533cac482a9d8f9211c8ff607968de3b27d1e4 (patch)
treef3cbaf44b6cf7cab075f4cc5f388bd1c3ecabd79 /system/database
parent74d0e23eae054c49bbf7d9d5c4738fa5a63754cf (diff)
parent40bbd60bcc5135f898f46e502f7b04ef065274e0 (diff)
Merge pull request #3551 from gadelat/voids
Fixed inconsistent return types
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--system/database/DB_utility.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index a0803f170..bbe65b410 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -822,7 +822,7 @@ abstract class CI_DB_driver {
{
if ( ! $this->trans_enabled)
{
- return FALSE;
+ return;
}
// When transactions are nested we only begin/commit/rollback the outermost ones
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 774d51533..57356ac53 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -316,7 +316,7 @@ abstract class CI_DB_utility {
* Database Backup
*
* @param array $params
- * @return void
+ * @return string
*/
public function backup($params = array())
{