From fbe4d79ca0a70f404dce628d66deeaa3d90a2225 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 27 Dec 2017 19:49:03 +0200 Subject: Merge pull request #5367 from carusogabriel/clean-elses Clean elses --- system/database/DB_forge.php | 6 ++---- system/database/DB_result.php | 9 ++++----- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'system/database') diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 3cb02ca4e..f1e0b1419 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -382,10 +382,8 @@ abstract class CI_DB_forge { { return TRUE; } - else - { - $if_not_exists = FALSE; - } + + $if_not_exists = FALSE; } $sql = ($if_not_exists) diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 98d8876a7..40b8fbb74 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -163,10 +163,8 @@ class CI_DB_result { { return $this->result_object(); } - else - { - return $this->custom_result_object($type); - } + + return $this->custom_result_object($type); } // -------------------------------------------------------------------- @@ -336,7 +334,8 @@ class CI_DB_result { if ($type === 'object') return $this->row_object($n); elseif ($type === 'array') return $this->row_array($n); - else return $this->custom_row_object($n, $type); + + return $this->custom_row_object($n, $type); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b