aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-01-25 12:56:52 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-01-25 12:56:52 +0000
commit36e4c5548ac36a67048706bf9c17f6eece082666 (patch)
tree16ef7a6dd430ca7f22dcfab1ef4641aad8a9d7a2
parent279d5f7d6f8ee674b024a2cf3069dc4ea9567398 (diff)
downloadelgg-36e4c5548ac36a67048706bf9c17f6eece082666.tar.gz
elgg-36e4c5548ac36a67048706bf9c17f6eece082666.tar.bz2
Fixes #709: get_language() now fails correctly. @ben Why is this introduced? Surely this is the same as get_current_language()?
git-svn-id: https://code.elgg.org/elgg/trunk@2615 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/languages.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index 16af24446..3b05f6753 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -89,9 +89,8 @@
if ((empty($language)) && (isset($CONFIG->language)))
$language = $CONFIG->language;
- if (!empty($lang)) {
- $lang = $language;
- return $lang;
+ if (!empty($language)) {
+ return $language;
}
return false;