diff options
| author | Greg Aker <greg@gregaker.net> | 2011-12-25 08:44:33 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-12-25 08:44:33 +0100 |
| commit | ef38f0a6d83025fbd99ace5ec60311acfe9121c4 (patch) | |
| tree | 1728bc5df9412d8eccc2919bf3cd3f6bbe6a52d0 /system/libraries/Upload.php | |
| parent | d90e1a0fb541ee94459a20cf8b0726aebaec9692 (diff) | |
| parent | a96ade374f28cdae97036fc253fd8b2a0e8dc81a (diff) | |
Merge branch 'develop' into feature/unit-tests
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 66e91c5b6..826bcceb8 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -5,9 +5,9 @@ * An open source application development framework for PHP 5.1.6 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Open Software License version 3.0 - * + * * This source file is subject to the Open Software License (OSL 3.0) that is * bundled with this package in the files license.txt / license.rst. It is * also available through the world wide web at this URL: @@ -934,13 +934,7 @@ class CI_Upload { */ public function display_errors($open = '<p>', $close = '</p>') { - $str = ''; - foreach ($this->error_msg as $val) - { - $str .= $open.$val.$close; - } - - return $str; + return (count($this->error_msg) > 0) ? $open . implode($close . $open, $this->error_msg) . $close : ''; } // -------------------------------------------------------------------- @@ -1086,4 +1080,4 @@ class CI_Upload { // END Upload Class /* End of file Upload.php */ -/* Location: ./system/libraries/Upload.php */
\ No newline at end of file +/* Location: ./system/libraries/Upload.php */ |