aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb/language')
-rw-r--r--phpBB/phpbb/language/language.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 47f055f56a..382d4db89e 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -549,6 +549,16 @@ class language
}
/**
+ * Returns the ISO code of the used language
+ *
+ * @return string The ISO code of the currently used language
+ */
+ public function get_used_language()
+ {
+ return $this->language_fallback[0];
+ }
+
+ /**
* Returns language fallback data
*
* @param bool $reload Whether or not to reload language files
@@ -559,12 +569,12 @@ class language
{
$fallback_array = array();
- if ($this->user_language !== false)
+ if ($this->user_language)
{
$fallback_array[] = $this->user_language;
}
- if ($this->default_language !== false)
+ if ($this->default_language)
{
$fallback_array[] = $this->default_language;
}