diff options
| author | CiaranG <ciaran@ciarang.com> | 2009-03-05 16:18:59 +0000 |
|---|---|---|
| committer | CiaranG <ciaran@ciarang.com> | 2009-03-05 16:18:59 +0000 |
| commit | 3c53e821cc545d14807c9197d07e8686028a846d (patch) | |
| tree | e51f35dc8783ea2ba3c9443d28a55a707330909a /lib/util.php | |
| parent | e5345d8d7a5b519cfb24c9e2a971b485b3c1c872 (diff) | |
| parent | ea0c5f565c9ca4b34c1071a51333f0f842a954b9 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 18e4f310c..f9a787d47 100644 --- a/lib/util.php +++ b/lib/util.php @@ -81,7 +81,7 @@ function common_language() // If there is a user logged in and they've set a language preference // then return that one... - if (common_logged_in()) { + if (_have_config() && common_logged_in()) { $user = common_current_user(); $user_language = $user->language; if ($user_language) @@ -315,6 +315,10 @@ function common_current_user() { global $_cur; + if (!_have_config()) { + return null; + } + if ($_cur === false) { if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) { |