iliaa           Tue Dec  6 18:32:27 2005 EDT

  Modified files:              
    /php-src/main       main.c 
  Log:
  MFB51: Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if 
  display_startup_error is off).
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.655&r2=1.656&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.655 php-src/main/main.c:1.656
--- php-src/main/main.c:1.655   Mon Dec  5 22:13:53 2005
+++ php-src/main/main.c Tue Dec  6 18:32:27 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.655 2005/12/06 03:13:53 iliaa Exp $ */
+/* $Id: main.c,v 1.656 2005/12/06 23:32:27 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -862,9 +862,8 @@
 
                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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to