aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-05-04 12:00:07 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-05-04 12:00:07 +0000
commit3416b60dd1156094f935d36fa3e50998bdc8fc6b (patch)
tree070de7cf586f38e12625dc75b3509b932bbfd231
parentc6e368d5a942e831d3321efa262abea3e965d8cf (diff)
downloadelgg-3416b60dd1156094f935d36fa3e50998bdc8fc6b.tar.gz
elgg-3416b60dd1156094f935d36fa3e50998bdc8fc6b.tar.bz2
Closes #824: Test variable to prevent error message in log.
git-svn-id: https://code.elgg.org/elgg/trunk@3256 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/languages.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index 3d62d08cb..7eda8b20e 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -77,11 +77,11 @@
$user = get_loggedin_user();
$language = false;
-
+
if (($user) && ($user->language))
$language = $user->language;
- if ((!$language) && ($CONFIG->language))
+ if ((!$language) && (isset($CONFIG->language)) && ($CONFIG->language))
$language = $CONFIG->language;
if ($language) {