diff --git a/upload/config.php b/upload/config.php index d0ec02912..c06e31aa4 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,7 +56,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 (unstable)'; $bb_cfg['tp_release_date'] = '23-01-2014'; -$bb_cfg['tp_release_state'] = 'R566'; +$bb_cfg['tp_release_state'] = 'R567'; // Database $charset = 'utf8'; @@ -223,7 +223,7 @@ define('TEMPLATES_DIR', BB_PATH .'/templates/'); define('TRIGGERS_DIR', BB_PATH .'/triggers/' ); // URLs -$bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" +$bb_cfg['ajax_url'] = '/ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" $bb_cfg['login_url'] = 'login.php'; # "http://{$domain_name}/login.php" $bb_cfg['pm_url'] = 'privmsg.php'; # "http://{$domain_name}/privmsg.php" $bb_cfg['posting_url'] = 'posting.php'; # "http://{$domain_name}/posting.php" @@ -538,4 +538,6 @@ $bb_cfg['captcha'] = array( ); // SEO -$bb_cfg['seo_link_home_page'] = false; \ No newline at end of file +$bb_cfg['seo_link_home_page'] = false; + +define('BB_CFG_LOADED', true); \ No newline at end of file diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index 595ede8ee..f00975926 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -2,6 +2,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); if (!defined('BB_SCRIPT')) define('BB_SCRIPT', 'undefined'); +if (!defined('BB_CFG_LOADED')) trigger_error('bb_cfg not loaded', E_USER_ERROR); // Exit if board is disabled via ON/OFF trigger if (!defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_SERVICE')) @@ -93,11 +94,6 @@ if (!defined('IN_AJAX')) ob_start('send_page'); } -if (DEBUG === true) -{ - require(DEV_DIR .'init_debug.php'); -} - // Cookie params $c = $bb_cfg['cookie_prefix']; define('COOKIE_DATA', $c .'data'); @@ -124,6 +120,15 @@ if (DBG_USER) error_reporting(E_ALL); ini_set('display_errors', 1); } +else +{ + unset($_COOKIE['explain']); +} + +if (DEBUG === true) +{ + require(DEV_DIR .'init_debug.php'); +} define('DELETED', -1); diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index 145b9af9e..48e3cc70c 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -224,7 +224,7 @@ $template->assign_vars(array( 'THIS_AVATAR' => get_avatar($userdata['user_avatar'], $userdata['user_avatar_type'], !bf($userdata['user_opt'], 'user_opt', 'allow_avatar')), 'SHOW_LOGIN_LINK' => !defined('IN_LOGIN'), 'AUTOLOGIN_DISABLED' => !$bb_cfg['allow_autologin'], - 'S_LOGIN_ACTION' => BB_ROOT . LOGIN_URL, + 'S_LOGIN_ACTION' => LOGIN_URL, 'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'], 'U_FAQ' => $bb_cfg['faq_url'],