mantisbt · Nov 14, 2012 · Nov 14, 2012 · Nov 14, 2012
Showing with 44 additions and 11 deletions.

+10 −11 config_defaults_inc.php

+6 −0 core.php

+28 −0 docbook/Admin_Guide/en-US/Configuration.xml
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -1122,23 +1122,22 @@
  */
 $g_calendar_date_format = 'Y-m-d H:i';
 
-/**************************
+/******************************
  * MantisBT TimeZone Settings *
- **************************/
+ ******************************/
 
 /**
- * Default timezone to use in MantisBT.
- * See http://us.php.net/manual/en/timezones.php
- * for a list of valid timezones.
+ * Default timezone to use in MantisBT
+ *
+ * If this config is left blank, it will be initialized by calling function
+ * {@link http://php.net/date-default-timezone-get date_default_timezone_get()}
+ * to determine the default timezone.
+ * Note that this function's behavior was modified in PHP 5.4.0.
  *
- * The date_default_timezone_get() calculates timezone based on the following:
- * 1. Reading the TZ environment variable (if non empty)
- * 2. Reading the value of the date.timezone php.ini option (if set)
- * 3. Querying the host operating system (if supported and allowed by the OS)
- * 4. If none of the above succeed, will return a default timezone of UTC.
+ * @link http://php.net/timezones List of Supported Timezones
  * @global string $g_default_timezone
  */
-$g_default_timezone = date_default_timezone_get();
+$g_default_timezone = '';
 
 /**************************
  * MantisBT News Settings *

diff --git a/core.php b/core.php
@@ -252,6 +252,12 @@ function __autoload( $className ) {
 		// if a default timezone is set in config, set it here, else we use php.ini's value
 		// having a timezone set avoids a php warning
 		date_default_timezone_set( config_get_global( 'default_timezone' ) );
+	} else {
+		# To ensure proper detection of timezone settings issues, we must not
+		# initialize the default timezone when executing admin checks
+		if( basename( $g_short_path ) != 'check' ) {
+			config_set_global( 'default_timezone', date_default_timezone_get(), true );
+		}
 	}
 
 	require_api( 'authentication_api.php' );

diff --git a/docbook/Admin_Guide/en-US/Configuration.xml b/docbook/Admin_Guide/en-US/Configuration.xml
@@ -1078,6 +1078,34 @@
 
     </section>
 
+	<section id="admin.config.timezone">
+		<title>Time Zone</title>
+
+		<variablelist>
+			<varlistentry>
+				<term>$g_default_timezone</term>
+				<listitem>
+					<para>Default timezone to use in MantisBT.
+						This must be set to one of the values specified in the
+						<ulink url="http://php.net/timezones ">
+							List of Supported Timezones</ulink>.
+					</para>
+					<para>If this config is left blank (default), it will be
+						initialized by calling function
+						<ulink url="http://php.net/date-default-timezone-get">
+							date_default_timezone_get()</ulink>
+						to determine the default timezone.
+						With PHP >= 5.3, this will result in a system warning if
+						the timezone has not been defined in
+						<ulink url="http://php.net/date.timezone">php.ini</ulink>.
+						Note that this function's behavior was modified in PHP 5.4.0.
+					</para>
+					<para>
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
+	</section>
 
     <section id="admin.config.news">
         <title>News</title>