diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-08-07 10:07:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 10:07:33 +0200 |
| commit | 32a60d9724c0b810314440c5306a72838299f18a (patch) | |
| tree | ce1dbe82be48b5c070a9b89cd3395b99625ef12f /system | |
| parent | 4aaf3847dbd3a33bdd3341a93462be4f0cbcaeef (diff) | |
| parent | 9957eb37a9f12e9d9ea48b26801b1cf573376539 (diff) | |
Merge pull request #5217 from erkaperka/develop
Minor change in _display() method in CI_Output class allowing us to o…
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Output.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 2dabb2445..aceef676a 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -412,7 +412,7 @@ class CI_Output { * @param string $output Output data override * @return void */ - public function _display($output = '') + public function _display($output = NULL) { // Note: We use load_class() because we can't use $CI =& get_instance() // since this function is sometimes called by the caching mechanism, @@ -429,7 +429,7 @@ class CI_Output { // -------------------------------------------------------------------- // Set the output data - if ($output === '') + if ($output === NULL) { $output =& $this->final_output; } |