From 122c88c88f6bab23b090085298f7cb449ac0b10a Mon Sep 17 00:00:00 2001 From: David McReynolds Date: Mon, 29 Sep 2014 14:39:46 -0700 Subject: [PATCH] Fix for getting the default option if one is set using the set_default_option method --- fuel/modules/fuel/libraries/Fuel_language.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fuel/modules/fuel/libraries/Fuel_language.php b/fuel/modules/fuel/libraries/Fuel_language.php index 21eb5fb69..338b4e020 100644 --- a/fuel/modules/fuel/libraries/Fuel_language.php +++ b/fuel/modules/fuel/libraries/Fuel_language.php @@ -262,7 +262,7 @@ public function is_default($lang) return TRUE; } // the default is the first option of the list - $default = key($this->options); + $default = $this->default_option(); return $lang == $default; } @@ -606,7 +606,7 @@ function lang_segment($uri = NULL, $routed = 'both') * Cleans a URI string value of any language segements * * @access public - * @param string The URI string to check. If none provided, will use the regment_array or rsegment_array on the URI object (optional) + * @param string The URI string to check. If none provided, will use the rsegment_array or rsegment_array on the URI object (optional) * @param boolean Determines whether to use a routed (TRUE), non-routed (FALSE) when looking at the URI segment if one is not provided in first argument (optional) * @return string */ @@ -622,7 +622,7 @@ function cleaned_uri($uri = NULL, $routed = FALSE) * Cleans a URI segments of any language segements * * @access public - * @param string The URI string to check. If none provided, will use the regment_array or rsegment_array on the URI object (optional) + * @param string The URI string to check. If none provided, will use the rsegment_array or rsegment_array on the URI object (optional) * @param boolean Determines whether to use a routed (TRUE), non-routed (FALSE) when looking at the URI segment if one is not provided in first argument (optional) * @return string */