From 7871a46bbb89d65909da903d15da3d1891d7846c Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Fri, 29 Jul 2005 18:16:29 +0000 Subject: [PATCH] update the date_default_*() to reflect last CVS commits git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@191821 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../functions/date-default-timezone-get.xml | 40 ++++++++++++++++--- .../functions/date-default-timezone-set.xml | 33 +-------------- reference/datetime/ini.xml | 4 +- 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/reference/datetime/functions/date-default-timezone-get.xml b/reference/datetime/functions/date-default-timezone-get.xml index d3d17774a6..2b16ddc0f4 100755 --- a/reference/datetime/functions/date-default-timezone-get.xml +++ b/reference/datetime/functions/date-default-timezone-get.xml @@ -1,5 +1,5 @@ - + date_default_timezone_get @@ -14,16 +14,44 @@ - This functions returns the default timezone previously set by - date_default_timezone_set. - + This functions returns the default timezone, using the following "guess" + order: + + + + The timezone set using the + date_default_timezone_set function (if any) + + + + + The TZ environment variable (if non empty) + + + + + The date.timezone ini option + (if set) + + + + + "magical" guess (if the operating system supports it) + + + + + If none of the above options succeeds, falback to UTC + + + + &reftitle.returnvalues; - Returns a string on success, or &false; if the default - timezone wasn't set yet. + Returns a string. diff --git a/reference/datetime/functions/date-default-timezone-set.xml b/reference/datetime/functions/date-default-timezone-set.xml index 0e98aa9861..ff0b9cc002 100755 --- a/reference/datetime/functions/date-default-timezone-set.xml +++ b/reference/datetime/functions/date-default-timezone-set.xml @@ -1,5 +1,5 @@ - + date_default_timezone_set @@ -17,37 +17,6 @@ date_default_timezone_set sets the default timezone used by all date/time functions. - - The order that PHP tries to find the default timezone is the following: - - - - The timezone set using this function (if any) - - - - - The TZ environment variable (if set) - - - - - The date.timezone ini option - (if set) - - - - - "magical" guess (if the operating system supports it) - - - - - If none of the above options succeeds, falback to UTC - - - - Since PHP 5.1.0 (when the date/time functions were rewritten), every call diff --git a/reference/datetime/ini.xml b/reference/datetime/ini.xml index fdee3f4707..9f6d938ed2 100755 --- a/reference/datetime/ini.xml +++ b/reference/datetime/ini.xml @@ -1,5 +1,5 @@ - +
&reftitle.runtime; &extension.runtime; @@ -113,7 +113,7 @@ The default timezone used by all date/time functions if the TZ environment variable isn't set. The precedence - order is described in the date_default_timezone_set + order is described in the date_default_timezone_get page.