summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-09-24 19:47:47 +0800
committerXinchen Hui <laruence@php.net>2012-09-24 19:47:47 +0800
commit8a930c93dd673b9f13350590a7b6e3a1a5ce4431 (patch)
treee944c095ea836f10736f5a73334ba4f0c5c501b8
parent518fa8c4cfa0b34b2f51e6691ddf73199e4de382 (diff)
parent8cdd6bc1e7dedd4733374b62feb09b88c5ca02db (diff)
downloadphp-git-8a930c93dd673b9f13350590a7b6e3a1a5ce4431.tar.gz
Merge branch '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