diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-03-20 17:30:02 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-03-20 17:30:02 +0100 |
| commit | 006cf0764295d37daa597f4ea9cf31abb75d1b68 (patch) | |
| tree | 4f40341fef42c760330e2caa501881ab195a67b2 /system/database/DB_result.php | |
| parent | 61e2a033717a4669117696d0b6913474e3f57954 (diff) | |
| parent | 02a0518e1c56ba3506f370362ac5ebdb8a138312 (diff) | |
Merge tag 'ci-upstream/3.1.7' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/DB_result.php')
| -rw-r--r-- | system/database/DB_result.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 98d8876a7..a5a4ca27d 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2017, British Columbia Institute of Technology + * Copyright (c) 2014 - 2018, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) - * @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 @@ -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); } // -------------------------------------------------------------------- |