- MFH for: Apply rest of html errors fix (Patch by Jan Lehnardt <jan@php.net>)

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 42e28379cc170460f507d03e7be9d83e258557cf..a9e20f41bf1b7ae281a8c7e724e3374a3f836c6a 100644 (file)
--- 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");
+               }       
        }
 }