mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 05:18:52 +00:00
seems like there were some critical bugs open...
Fix bug #2265 git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@8377 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ffc3d57e46
commit
c43d5f9f6e
6 changed files with 17 additions and 18 deletions
|
@ -34,7 +34,7 @@ define('IN_PHPBB', 1);
|
||||||
$phpbb_root_path = "./../";
|
$phpbb_root_path = "./../";
|
||||||
require($phpbb_root_path . 'extension.inc');
|
require($phpbb_root_path . 'extension.inc');
|
||||||
|
|
||||||
$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
|
$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
|
||||||
$no_page_header = $cancel;
|
$no_page_header = $cancel;
|
||||||
|
|
||||||
require('./pagestart.' . $phpEx);
|
require('./pagestart.' . $phpEx);
|
||||||
|
|
|
@ -36,23 +36,20 @@ if( !empty($setmodules) )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// Load default header
|
|
||||||
//
|
|
||||||
if( isset($HTTP_GET_VARS['export_pack']) )
|
|
||||||
{
|
|
||||||
if ( $HTTP_GET_VARS['export_pack'] == "send" )
|
|
||||||
{
|
|
||||||
$no_page_header = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$phpbb_root_path = "./../";
|
$phpbb_root_path = "./../";
|
||||||
require($phpbb_root_path . 'extension.inc');
|
require($phpbb_root_path . 'extension.inc');
|
||||||
|
|
||||||
$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
|
$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
|
||||||
$no_page_header = $cancel;
|
$no_page_header = $cancel;
|
||||||
|
|
||||||
|
//
|
||||||
|
// Load default header
|
||||||
|
//
|
||||||
|
if ((!empty($HTTP_GET_VARS['export_pack']) && $HTTP_GET_VARS['export_pack'] == 'send') || (!empty($_GET['export_pack']) && $_GET['export_pack'] == 'send'))
|
||||||
|
{
|
||||||
|
$no_page_header = true;
|
||||||
|
}
|
||||||
|
|
||||||
require('./pagestart.' . $phpEx);
|
require('./pagestart.' . $phpEx);
|
||||||
|
|
||||||
if ($cancel)
|
if ($cancel)
|
||||||
|
|
|
@ -41,10 +41,10 @@ if( !empty($setmodules) )
|
||||||
$phpbb_root_path = "./../";
|
$phpbb_root_path = "./../";
|
||||||
require($phpbb_root_path . 'extension.inc');
|
require($phpbb_root_path . 'extension.inc');
|
||||||
|
|
||||||
$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
|
$confirm = (isset($HTTP_POST_VARS['confirm']) || isset($_POST['confirm'])) ? TRUE : FALSE;
|
||||||
$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
|
$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? TRUE : FALSE;
|
||||||
|
|
||||||
$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE;
|
$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || !empty($_POST['send_file']) || $cancel) ? TRUE : FALSE;
|
||||||
|
|
||||||
require('./pagestart.' . $phpEx);
|
require('./pagestart.' . $phpEx);
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ define('IN_PHPBB', 1);
|
||||||
$phpbb_root_path = "./../";
|
$phpbb_root_path = "./../";
|
||||||
require($phpbb_root_path . 'extension.inc');
|
require($phpbb_root_path . 'extension.inc');
|
||||||
|
|
||||||
$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
|
$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? true : false;
|
||||||
$no_page_header = $cancel;
|
$no_page_header = $cancel;
|
||||||
|
|
||||||
require('./pagestart.' . $phpEx);
|
require('./pagestart.' . $phpEx);
|
||||||
|
|
|
@ -83,6 +83,8 @@ p,ul,td {font-size:10pt;}
|
||||||
<li>[Fix] Fixed the group permission system's use of array access</li>
|
<li>[Fix] Fixed the group permission system's use of array access</li>
|
||||||
<li>[Fix] Simple group permissions now work properly</li>
|
<li>[Fix] Simple group permissions now work properly</li>
|
||||||
<li>[Sec] Fix possible XSRF Vulnerability in private messaging and groups handling</li>
|
<li>[Sec] Fix possible XSRF Vulnerability in private messaging and groups handling</li>
|
||||||
|
<li>[Fix] Fix inability to export smilies (Bug #2265)</li>
|
||||||
|
<li>[Fix] Fixing some problems with PHP5 and register_long_arrays off</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
|
<a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
|
||||||
|
|
|
@ -370,7 +370,7 @@ function init_userprefs($userdata)
|
||||||
|
|
||||||
$userdata['user_lang'] = $default_lang;
|
$userdata['user_lang'] = $default_lang;
|
||||||
}
|
}
|
||||||
elseif ( $userdata['user_id'] === ANONYMOUS && $board_config['default_lang'] !== $default_lang )
|
elseif ( $userdata['user_id'] == ANONYMOUS && $board_config['default_lang'] !== $default_lang )
|
||||||
{
|
{
|
||||||
$sql = 'UPDATE ' . CONFIG_TABLE . "
|
$sql = 'UPDATE ' . CONFIG_TABLE . "
|
||||||
SET config_value = '" . $default_lang . "'
|
SET config_value = '" . $default_lang . "'
|
||||||
|
|
Loading…
Add table
Reference in a new issue