From 3e90009263df6f21c9ba64b659367bff890bad65 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 23 Nov 2011 08:29:23 -0600 Subject: [PATCH] Tweak the language line logic. --- laravel/lang.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/laravel/lang.php b/laravel/lang.php index 01238f3c..15344d0b 100644 --- a/laravel/lang.php +++ b/laravel/lang.php @@ -65,7 +65,10 @@ protected function __construct($key, $replacements = array(), $language = null) */ public static function line($key, $replacements = array(), $language = null) { - if (is_null($language)) $language = Config::$items['application']['language']; + if (is_null($language)) + { + $language = Config::$items['application']['language']; + } return new static($key, $replacements, $language); } @@ -93,7 +96,7 @@ public static function line($key, $replacements = array(), $language = null) */ public function get($language = null, $default = null) { - if ( ! is_null($language)) $this->language = $language; + if (is_null($language)) $language = $this->language; list($file, $line) = $this->parse($this->key); @@ -102,7 +105,7 @@ public function get($language = null, $default = null) return ($default instanceof Closure) ? call_user_func($default) : $default; } - return $this->replace(Arr::get(static::$lines[$this->language][$file], $line, $default)); + return $this->replace(Arr::get(static::$lines[$language][$file], $line, $default)); } /**