diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-03 16:12:03 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-03 16:12:03 +0000 |
| commit | 2b4525ae97dc0ab6d7d9391fe4c126bdf7d15dbb (patch) | |
| tree | 9059e10d2d5c9fdedd58776f323f6ebe58601a20 /phpBB/includes | |
| parent | e08317eb7132692ab93115d47e78b4841909c07c (diff) | |
| download | forums-2b4525ae97dc0ab6d7d9391fe4c126bdf7d15dbb.tar forums-2b4525ae97dc0ab6d7d9391fe4c126bdf7d15dbb.tar.gz forums-2b4525ae97dc0ab6d7d9391fe4c126bdf7d15dbb.tar.bz2 forums-2b4525ae97dc0ab6d7d9391fe4c126bdf7d15dbb.tar.xz forums-2b4525ae97dc0ab6d7d9391fe4c126bdf7d15dbb.zip | |
some tiny bugfixes.
git-svn-id: file:///svn/phpbb/trunk@6702 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 13 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index a04ad9dc0f..92f8057676 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -735,7 +735,14 @@ class acp_board */ function dateformat_select($value, $key) { - global $user; + global $user, $config; + + // Let the format_date function operate with the acp values + $old_tz = $user->timezone; + $old_dst = $user->dst; + + $user->timezone = $config['board_timezone']; + $user->dst = $config['board_dst']; $dateformat_options = ''; @@ -753,6 +760,10 @@ class acp_board } $dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>'; + // Reset users date options + $user->timezone = $old_tz; + $user->dst = $old_dst; + return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('$key').value = '$value'; } else { document.getElementById('$key').value = this.value; }\">$dateformat_options</select> <input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\" />"; } diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index c4c1c85793..a1937b592f 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -262,7 +262,7 @@ pagination_sep = \'{PAGINATION_SEP}\' } else { - $filelist[substr($row['template_filename'], 0, $slash_pos + 1)] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slashpos - 1); + $filelist[substr($row['template_filename'], 0, $slash_pos + 1)] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1); } } } diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 43d6b862ff..e975469685 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3363,7 +3363,7 @@ function page_header($page_title = '', $display_online_list = true) 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false, - 'S_BOARD_DISABLED' => ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_')) ? true : false, + 'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false, 'S_REGISTERED_USER' => $user->data['is_registered'], 'S_IS_BOT' => $user->data['is_bot'], 'S_USER_PM_POPUP' => $user->optionget('popuppm'), diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index d67478b190..0fcc42def1 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1242,7 +1242,7 @@ function get_folder_status($folder_id, $folder) */ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = true) { - global $db, $auth, $config, $phpEx, $template, $user; + global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path; // We do not handle erasing pms here if ($mode == 'delete') |