2 files changed, 13 insertions, 2 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);
 										}
 									}
 								}