cvs: php4(PHP_4_2_0) /ext/imap php_imap.c

sniper Wed Jun 26 19:31:11 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/imap php_imap.c Log: MFH: fix for bug: #17999 Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.112.2.1 php4/ext/imap/php_imap.c:1.112.2.2 --- php4/ext/imap/php_imap.c:1.112.2.1 Wed Apr 24 11:30:16 2002 +++ php4/ext/imap/php_imap.c Wed Jun 26 19:31:09 2002 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.112.2.1 2002/04/24 15:30:16 sniper Exp $ */ +/* $Id: php_imap.c,v 1.112.2.2 2002/06/26 23:31:09 sniper Exp $ */ #define IMAP41 @@ -620,20 +620,24 @@ if (IMAPG(imap_errorstack) != NIL) { /* output any remaining errors at their original error level */ - ecur = IMAPG(imap_errorstack); - while (ecur != NIL) { - php_error(E_NOTICE, "%s (errflg=%d)", ecur->LTEXT, ecur->errflg); - ecur = ecur->next; + if (EG(error_reporting) & E_NOTICE) { + ecur = IMAPG(imap_errorstack); + while (ecur != NIL) { + php_error(E_NOTICE, "%s (errflg=%d)", ecur->LTEXT, ecur->errflg); + ecur = ecur->next; + } } mail_free_errorlist(&IMAPG(imap_errorstack)); } if (IMAPG(imap_alertstack) != NIL) { /* output any remaining alerts at E_NOTICE level */ - acur = IMAPG(imap_alertstack); - while (acur != NIL) { - php_error(E_NOTICE, acur->LTEXT); - acur = acur->next; + if (EG(error_reporting) & E_NOTICE) { + acur = IMAPG(imap_alertstack); + while (acur != NIL) { + php_error(E_NOTICE, acur->LTEXT); + acur = acur->next; + } } mail_free_stringlist(&IMAPG(imap_alertstack)); } @@ -4080,9 +4084,6 @@ TSRMLS_FETCH(); /* Author: CJH */ - if (!(EG(error_reporting) & E_NOTICE)) { - return; - } if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */ if (IMAPG(imap_errorstack) == NIL) { IMAPG(imap_errorstack) = mail_newerrorlist();