diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-24 13:57:02 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-24 13:57:02 +0000 |
| commit | b83b1c7542f829afc296c4fa53d5b18b624e0833 (patch) | |
| tree | dda12887ab67d121e339b2b5e1e7256ceb8fe43f /phpBB/includes/session.php | |
| parent | 5aa220bcd21c6e3decd8f2b9833dc90a8ee6a274 (diff) | |
| download | forums-b83b1c7542f829afc296c4fa53d5b18b624e0833.tar forums-b83b1c7542f829afc296c4fa53d5b18b624e0833.tar.gz forums-b83b1c7542f829afc296c4fa53d5b18b624e0833.tar.bz2 forums-b83b1c7542f829afc296c4fa53d5b18b624e0833.tar.xz forums-b83b1c7542f829afc296c4fa53d5b18b624e0833.zip | |
Maybe we shouldn't trust the language settings in the db so much.
git-svn-id: file:///svn/phpbb/trunk@7790 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index ec43c02bc9..c297a961a8 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1206,7 +1206,7 @@ class user extends session if ($this->data['user_id'] != ANONYMOUS) { $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : $config['default_lang']; - $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; + $this->lang_path = $phpbb_root_path . 'language/' . basename($this->lang_name) . '/'; $this->date_format = $this->data['user_dateformat']; $this->timezone = $this->data['user_timezone'] * 3600; @@ -1215,7 +1215,7 @@ class user extends session else { $this->lang_name = $config['default_lang']; - $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; + $this->lang_path = $phpbb_root_path . 'language/' . basename($this->lang_name) . '/'; $this->date_format = $config['default_dateformat']; $this->timezone = $config['board_timezone'] * 3600; $this->dst = $config['board_dst'] * 3600; @@ -1616,7 +1616,7 @@ class user extends session { global $phpbb_root_path, $config; - $this->lang_path = $phpbb_root_path . 'language/' . $config['default_lang'] . '/'; + $this->lang_path = $phpbb_root_path . 'language/' . basename($config['default_lang']) . '/'; } // $lang == $this->lang |