summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-12-27 18:49:03 +0100
committerGitHub <noreply@github.com>2017-12-27 18:49:03 +0100
commit3b470a6934a030c4bc57ac4c070539b5dd3e13b9 (patch)
tree5cca7a57a296006e09773b553a8159cc37316445 /system/database
parentfbae310a44e5d6fb3f962d148c80a60cd38c884a (diff)
parent7774e3846c525ff65c6d9b86aacb1cc3bc229e3e (diff)
Merge pull request #5367 from carusogabriel/clean-elses
Clean elses
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_forge.php6
-rw-r--r--system/database/DB_result.php9
2 files changed, 6 insertions, 9 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 31fae43cf..dbf76fd13 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);
}
// --------------------------------------------------------------------