From: foobar <sniper@php.net>
Date: Wed, 26 Jun 2002 23:31:09 +0000 (+0000)
Subject: MFH: fix for bug: #17999
X-Git-Tag: php-4.2.3RC1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34c3cfa84997ad3eba16403d4383180995d3607f;p=php

MFH: fix for bug: #17999
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 5f3ce88bde..1dd76fa628 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -620,20 +620,24 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 
 	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 @@ void mm_log(char *str, long errflg)
 	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();