iliaa Thu Apr 1 17:05:38 2004 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_execute.c
/php-src/tests/lang bug27731.phpt
Log:
MFH: Fixed reversed condition for error reporting.
http://cvs.php.net/diff.php/Zend/zend_execute.c?r1=1.316.2.33&r2=1.316.2.34&ty=u
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.316.2.33 Zend/zend_execute.c:1.316.2.34
--- Zend/zend_execute.c:1.316.2.33 Thu Apr 1 12:45:33 2004
+++ Zend/zend_execute.c Thu Apr 1 17:05:38 2004
@@ -2487,7 +2487,7 @@
NEXT_OPCODE();
case ZEND_END_SILENCE: {
zval restored_error_reporting;
- if (EG(error_reporting)) {
+ if (!EG(error_reporting)) {
restored_error_reporting.type =
IS_LONG;
restored_error_reporting.value.lval =
EX(Ts)[EX(opline)->op1.u.var].tmp_var.value.lval;
convert_to_string(&restored_error_reporting);
http://cvs.php.net/diff.php/php-src/tests/lang/bug27731.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/tests/lang/bug27731.phpt
diff -u php-src/tests/lang/bug27731.phpt:1.1.2.1
php-src/tests/lang/bug27731.phpt:1.1.2.2
--- php-src/tests/lang/bug27731.phpt:1.1.2.1 Sun Mar 28 19:52:20 2004
+++ php-src/tests/lang/bug27731.phpt Thu Apr 1 17:05:38 2004
@@ -3,8 +3,8 @@
--FILE--
<?php
error_reporting(E_ALL ^ E_NOTICE);
- @error_reporting(0);
+ @error_reporting(E_WARNING);
var_dump(error_reporting());
?>
--EXPECT--
-int(0)
+int(2)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
