From 74049eb191bd562d18575c6d69e5e217806a19ad Mon Sep 17 00:00:00 2001
From: Derick Rethans <derick@php.net>
Date: Tue, 3 Sep 2002 09:56:20 +0000
Subject: [PATCH] - MFH for: Apply rest of html errors fix (Patch by Jan
 Lehnardt <jan@php.net>)

---
 Zend/zend_ini.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 42e28379cc..a9e20f41bf 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -305,15 +305,25 @@ static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
 				display_string = ini_entry->orig_value;
 				display_string_length = ini_entry->orig_value_length;
 			} else {
-				display_string = "<i>no value</i>";
-				display_string_length = sizeof("<i>no value</i>")-1;
+				if(zend_uv.html_errors) {
+					display_string = "<i>no value</i>";
+					display_string_length = sizeof("<i>no value</i>")-1;
+				} else {
+					display_string = "no value";
+					display_string_length = sizeof("no value")-1;
+				}	
 			}
 		} else if (ini_entry->value && ini_entry->value[0]) {
 			display_string = ini_entry->value;
 			display_string_length = ini_entry->value_length;
 		} else {
-			display_string = "<i>no value</i>";
-			display_string_length = sizeof("<i>no value</i>")-1;
+			if(zend_uv.html_errors) {
+				display_string = "<i>no value</i>";
+				display_string_length = sizeof("<i>no value</i>")-1;
+			} else {
+				display_string = "no value";
+				display_string_length = sizeof("no value")-1;
+			}	
 		}
 		ZEND_WRITE(display_string, display_string_length);
 	}
@@ -351,9 +361,17 @@ ZEND_INI_DISP(zend_ini_color_displayer_cb)
 		value = NULL;
 	}
 	if (value) {
-		zend_printf("<font color=\"%s\">%s</font>", value, value);
+		if (zend_uv.html_errors) {
+			zend_printf("<font color=\"%s\">%s</font>", value, value);
+		} else {
+			ZEND_PUTS(value);
+		}   
 	} else {
-		ZEND_PUTS("<i>no value</i>;");
+		if (zend_uv.html_errors) {
+			ZEND_PUTS("<i>no value</i>;");
+		} else {
+			ZEND_PUTS("no value");
+		}	
 	}
 }
 
-- 
2.40.0