aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-10-16 10:35:24 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-10-16 10:35:24 +0000
commit46413f440e1f08dc6cf97db2f0aa4fb6caacb574 (patch)
tree8f4885322187e04614ea8f52b75cb6d8fcf011a3 /phpBB/includes
parent7fd3e1943c83f88268a96d67d4446721721e9838 (diff)
downloadforums-46413f440e1f08dc6cf97db2f0aa4fb6caacb574.tar
forums-46413f440e1f08dc6cf97db2f0aa4fb6caacb574.tar.gz
forums-46413f440e1f08dc6cf97db2f0aa4fb6caacb574.tar.bz2
forums-46413f440e1f08dc6cf97db2f0aa4fb6caacb574.tar.xz
forums-46413f440e1f08dc6cf97db2f0aa4fb6caacb574.zip
Fixed some bugs with banning and some code that wasnt updated when we changed the theme/template system
git-svn-id: file:///svn/phpbb/trunk@1218 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
-rw-r--r--phpBB/includes/sessions.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a6c34a4345..66149d509a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1069,7 +1069,7 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "",
if( empty($theme) )
{
- $theme = setuptheme($board_config['default_theme']);
+ $theme = setup_style($board_config['default_style']);
}
//
diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 2d8937c328..2e6693f011 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -78,7 +78,7 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
//
if($ban_info['ban_ip'] || $ban_info['ban_userid'])
{
- include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx);
+ include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
message_die(CRITICAL_MESSAGE, $lang['You_been_banned']);
}
else