summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-09-24 19:47:28 +0800
committerXinchen Hui <laruence@php.net>2012-09-24 19:47:28 +0800
commit8cdd6bc1e7dedd4733374b62feb09b88c5ca02db (patch)
tree554d82a87a9682c4c23af07824b95d29931da862
parentd9ad532050c45e8b387407b42b7abc16cbffc63f (diff)
parent2cbc4053ae33245f8e13502ed289292aee19ef36 (diff)
downloadphp-git-8cdd6bc1e7dedd4733374b62feb09b88c5ca02db.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--ext/standard/tests/general_functions/bug60723.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/general_functions/bug60723.phpt b/ext/standard/tests/general_functions/bug60723.phpt
index cd73c8c0c9..07b801bcfe 100644
--- a/ext/standard/tests/general_functions/bug60723.phpt
+++ b/ext/standard/tests/general_functions/bug60723.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #55371 (get_magic_quotes_gpc() and get_magic_quotes_runtime() throw deprecated warning)
+Bug #60723 (error_log error time has changed to UTC ignoring default timezo)
--INI--
date.timezone=ASIA/Chongqing
log_errors=On