summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-08-11 03:30:34 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-08-11 03:30:34 +0200
commit4062d48ca89736c952e9be17bb395d36140f4668 (patch)
treedb627bcf1753fb2e70243f6bf6e789c79f06568d
parentc5b044b739234c1e1635d4a4647b3440c44f4fa3 (diff)
removed redundant upload lang file, after lang name changs, it was blocking the CI lang file from loading. Fixes #473
-rw-r--r--system/libraries/Upload.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index c18c178df..0aa6d4c20 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -937,9 +937,12 @@ class CI_Upload {
*/
function display_errors($open = '<p>', $close = '</p>')
{
+ $CI =& get_instance();
+ $CI->lang->load('upload');
$str = '';
foreach ($this->error_msg as $val)
{
+ $str .= '<pre>'.print_r($CI->lang->line($msg), TRUE).'</pre>';
$str .= $open.$val.$close;
}