Skip to content

Commit

Permalink
Fix for getting the default option if one is set using the set_defaul…
Browse files Browse the repository at this point in the history
…t_option method
  • Loading branch information
David McReynolds committed Sep 29, 2014
1 parent 465b28a commit 122c88c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fuel/modules/fuel/libraries/Fuel_language.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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
*/
Expand All @@ -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
*/
Expand Down

0 comments on commit 122c88c

Please sign in to comment.