diff options
| author | Xinchen Hui <laruence@php.net> | 2012-09-24 11:00:58 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-09-24 11:00:58 +0800 |
| commit | d9ad532050c45e8b387407b42b7abc16cbffc63f (patch) | |
| tree | f043868e99f13f8f0e07c4280ae6f51a6502e8ea | |
| parent | 395d77c540a2d9d0745c8b4c75d60599c6e17c87 (diff) | |
| parent | 923511d364ad84500bb097aca15385129ce6e336 (diff) | |
| download | php-git-d9ad532050c45e8b387407b42b7abc16cbffc63f.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/standard/tests/general_functions/bug60723.phpt
| -rw-r--r-- | ext/standard/tests/general_functions/bug60723.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/tests/general_functions/bug60723.phpt b/ext/standard/tests/general_functions/bug60723.phpt index 1d9ef6a1d4..cd73c8c0c9 100644 --- a/ext/standard/tests/general_functions/bug60723.phpt +++ b/ext/standard/tests/general_functions/bug60723.phpt @@ -9,9 +9,11 @@ $dir = dirname(__FILE__); $log = $dir . "/tmp.err"; ini_set("error_log", $log); echo $aa; +error_log("dummy"); readfile($log); unlink($log); ?> --EXPECTF-- Notice: Undefined variable: aa in %sbug60723.php on line %d [%s ASIA/Chongqing] PHP Notice: Undefined variable: aa in %sbug60723.php on line %d +[%s ASIA/Chongqing] dummy |