Merge pull request #2417 from thefuzzy0ne/fix/upload_dry
Fix/upload dry
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 5861df5..8542804 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1090,18 +1090,14 @@
$CI =& get_instance();
$CI->lang->load('upload');
- if (is_array($msg))
+ if ( ! is_array($msg))
{
- foreach ($msg as $val)
- {
- $msg = ($CI->lang->line($val) === FALSE) ? $val : $CI->lang->line($val);
- $this->error_msg[] = $msg;
- log_message('error', $msg);
- }
+ $msg = array($msg);
}
- else
+
+ foreach ($msg as $val)
{
- $msg = ($CI->lang->line($msg) === FALSE) ? $msg : $CI->lang->line($msg);
+ $msg = ($CI->lang->line($val) === FALSE) ? $val : $CI->lang->line($val);
$this->error_msg[] = $msg;
log_message('error', $msg);
}