Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if

display_startup_error is off).

diff --git a/NEWS b/NEWS
index 53bb660bc7e589a6818deba3b28c3317e773992d..a803cab61bcd9831250960d3ef75bd1812075c20 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,6 @@ PHP                                                                        NEWS
   proper init). (Ilia)
 - Fixed bug #35490 (socket_sendto() unable to handle IPv6 addresses). (Tony)
 - Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
-- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev) 
 - Fixed bug #35470 (Assigning global using variable name from array doesn't
   function). (Dmitry)
 - Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia)
@@ -61,6 +60,9 @@ PHP                                                                        NEWS
 - Fixed bug #35062 (socket_read() produces warnings on non blocking sockets).
   (Nuno, Ilia)
 - Fixed bug #35028 (SimpleXML object fails FALSE test). (Marcus)
+- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev) 
+- Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if 
+  display_startup_error is off). (Ilia)
 
 28 Nov 2005, PHP 5.1.1
 - Disabled native date class to prevent pear::date conflict. (Ilia)

diff --git a/main/main.c b/main/main.c
index 82706abfc3e1cfec220848a89ded961d2bf99f15..9b9ae472b4e2790e9ca0879d0d710dd030d44597 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -746,9 +746,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 
                if (!module_initialized || PG(log_errors)) {
                        char *log_buffer;
-
 #ifdef PHP_WIN32
-                       if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
+                       if ((type == E_CORE_ERROR || type == E_CORE_WARNING) && PG(display_startup_errors)) {
                                MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE);
                        }
 #endif