summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-26 23:05:06 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-26 23:05:06 +0100
commit719b60f7e84e7060b679a9359a487f5cbbb937bf (patch)
tree6649a90fb03d2c42bb393ede79cc819f420bf2f4
parentfeb1e0578194fc1ca114bcafe46cba3f86245bef (diff)
Fix some erroneous variable names (sorry)
-rw-r--r--system/core/Lang.php2
-rw-r--r--system/helpers/language_helper.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 47f6c00ee..9e6f43716 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -117,7 +117,7 @@ class CI_Lang {
{
foreach (get_instance()->load->get_package_paths(TRUE) as $package_path)
{
- $package_path .= 'language/'.$idiom.'/'.$langpath;
+ $package_path .= 'language/'.$idiom.'/'.$langfile;
if ($basepath !== $package_path && file_exists($package_path))
{
include($package_path);
diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php
index f931208e1..6d24a9ca6 100644
--- a/system/helpers/language_helper.php
+++ b/system/helpers/language_helper.php
@@ -55,9 +55,9 @@ if ( ! function_exists('lang'))
$CI =& get_instance();
$line = $CI->lang->line($line);
- if ($id !== '')
+ if ($for !== '')
{
- $line = '<label for="'.$id.'"'._stringify_attributes($attributes).'>'.$line.'</label>';
+ $line = '<label for="'.$for.'"'._stringify_attributes($attributes).'>'.$line.'</label>';
}
return $line;