summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Language.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index cf6d53239..b679c891f 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -78,7 +78,7 @@ class CI_Language {
}
else
{
- show_error('Unable to load the requested language file: language/'.$langfile);
+ show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile);
}
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 231a0f369..9044e3224 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -106,6 +106,7 @@ SVN Revision: </p>
<li>Fixed assorted user guide typos or examples (#6743, #7214, #7516, #7287, #7852, #8224, #8324, #8349).</li>
<li>Fixed a bug in the Form Validation library where multiple callbacks weren't working (#6110)</li>
<li>doctype helper default value was missing a "1".</li>
+ <li>Fixed a bug in the language class when outputting an error for an unfound file.</li>
<li>Fixed a bug in the Calendar library where the shortname was output for "May".</li>
<li>Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.</li>
<li>Fixed a fatal error in the Oracle and ODBC drivers (#6752)</li>