diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-16 17:31:49 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-16 17:31:49 +0000 |
| commit | cac4518b395fec376e1a2bb01f566d5a1e61f825 (patch) | |
| tree | c7e8361280cd8e48d627a1760e26ec6e3a6fd741 /phpBB/includes/functions.php | |
| parent | 40ddc64afed38f66e100b0aa0882dc3c57c05cf8 (diff) | |
| download | forums-cac4518b395fec376e1a2bb01f566d5a1e61f825.tar forums-cac4518b395fec376e1a2bb01f566d5a1e61f825.tar.gz forums-cac4518b395fec376e1a2bb01f566d5a1e61f825.tar.bz2 forums-cac4518b395fec376e1a2bb01f566d5a1e61f825.tar.xz forums-cac4518b395fec376e1a2bb01f566d5a1e61f825.zip | |
Mainly language updates but some bug fixes too
git-svn-id: file:///svn/phpbb/trunk@1332 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 83850f8b03..40db1edc0f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -163,16 +163,12 @@ function make_jumpbox($match_forum_id = 0) } } } - else - { - $boxstring .= '<option value="-1">-- ! No Forums ! --</option>'; - } } $boxstring .= '</select>'; } else { - $boxstring .= '<select><option value="-1">-- ! No Categories ! --</option></select>'; + $boxstring .= '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>'; } if( isset($SID) ) @@ -275,6 +271,18 @@ function init_userprefs($userdata) include($phpbb_root_path . 'language/lang_english/lang_main.' . $phpEx); } + if( defined("IN_ADMIN") ) + { + if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) ) + { + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); + } + else + { + include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx); + } + } + return; } |