From d5c6d1d434555167f9d7adfdd3805e92e5bc266c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 10 Aug 2009 09:13:28 +0000 Subject: [PATCH] reverted all changes made to this code block, especially the one mentioned in r9704 with reference to wrong bug report "undoing change from #9575, as it broke the board disabled message". The board disabled message still works fine. If there are any problems with the code and settings within the ACP, please tell me and i will check them. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9941 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_board.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 7bc94d685e..ea0de2ef30 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -440,7 +440,7 @@ class acp_board // We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to... foreach ($display_vars['vars'] as $config_name => $null) { - if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) + if ($null === false || strpos($config_name, 'legend') !== false) { continue; } @@ -450,6 +450,12 @@ class acp_board continue; } + // If not set, then this is a valid entry and needs to be emptied (select_multiple, checkbox) + if (!isset($cfg_array[$config_name])) + { + $cfg_array[$config_name] = ''; + } + // Erm, we spotted an array if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name])) {