Remove highlight.bg, it was removed in the old trunk and its not referenced in zend_h...

diff --git a/NEWS b/NEWS
index 2493a5f356c0912b91e13c416bc348291c4dd96b..d3ac69a20e917f72ed311589790fe8c14bc0ab02 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@
 
 - Removed legacy features: (Kalle)
   . define_syslog_variables ini option and its associated function.
+  . highlight.bg ini option.
   . register_globals.
   . register_long_arrays ini option.
   . y2k_compliance ini option.

diff --git a/Zend/tests/bug35655.phpt b/Zend/tests/bug35655.phpt
index 10d9c0c74678e9a6ec408a80abf620a4fdfcdba4..bbb137799a323043bbea231f4b224a3601e2a132 100755 (executable)
--- a/Zend/tests/bug35655.phpt
+++ b/Zend/tests/bug35655.phpt
@@ -4,7 +4,6 @@ Bug #35655 (whitespace following end of heredoc is lost)
 highlight.string  = #DD0000
 highlight.comment = #FF8000
 highlight.keyword = #007700
-highlight.bg      = #FFFFFF
 highlight.default = #0000BB
 highlight.html    = #000000
 --FILE--

diff --git a/Zend/tests/bug42767.phpt b/Zend/tests/bug42767.phpt
index 484918cdb7c68df9757f30df4fce868a54c7975e..b57177e4b5e58ce934a53828ff22a8aedb8fd618 100644 (file)
--- a/Zend/tests/bug42767.phpt
+++ b/Zend/tests/bug42767.phpt
@@ -4,7 +4,6 @@ Bug #42767 (highlight_string() truncates trailing comments)
 highlight.string  = #DD0000
 highlight.comment = #FF8000
 highlight.keyword = #007700
-highlight.bg      = #FFFFFF
 highlight.default = #0000BB
 highlight.html    = #000000
 --FILE--

diff --git a/Zend/tests/nowdoc_013.phpt b/Zend/tests/nowdoc_013.phpt
index f4ee251749872d0ad91ead27bab2789b1a766e06..3e7d41fe075667b823ba19cfcb8431866bf38df0 100644 (file)
--- a/Zend/tests/nowdoc_013.phpt
+++ b/Zend/tests/nowdoc_013.phpt
@@ -4,7 +4,6 @@ Test whitespace following end of nowdoc
 highlight.string  = #DD0000
 highlight.comment = #FF8000
 highlight.keyword = #007700
-highlight.bg      = #FFFFFF
 highlight.default = #0000BB
 highlight.html    = #000000
 --FILE--

diff --git a/Zend/tests/nowdoc_014.phpt b/Zend/tests/nowdoc_014.phpt
index b8948699f840cf32a50fe669ca8e756d0d64bed7..694490b17d5849854780f8c8c03924ee9293fc8e 100644 (file)
--- a/Zend/tests/nowdoc_014.phpt
+++ b/Zend/tests/nowdoc_014.phpt
@@ -4,7 +4,6 @@ Highlighting empty nowdoc
 highlight.string  = #DD0000
 highlight.comment = #FF8000
 highlight.keyword = #007700
-highlight.bg      = #FFFFFF
 highlight.default = #0000BB
 highlight.html    = #000000
 --FILE--

diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt
index 709e57dc0038d45605c7fda44fb34eb9d86faec7..d1a0323c58edfb2f2a30f3e345a8d7378a112398 100644 (file)
--- a/ext/standard/tests/strings/highlight_file.phpt
+++ b/ext/standard/tests/strings/highlight_file.phpt
@@ -4,7 +4,6 @@ highlight_file() tests
 highlight.string=#DD0000
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FFFFFF
 highlight.default=#0000BB
 highlight.html=#000000
 allow_url_include=1

diff --git a/main/main.c b/main/main.c
index 63469f530ff333a716d0a522ee4bd44753c54bb3..ccf618ce80805c681412efcb6e8f63b002fd5ac1 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -425,7 +425,6 @@ static PHP_INI_MH(OnChangeMailForceExtra)
 /* {{{ PHP_INI
  */
 PHP_INI_BEGIN()
-       PHP_INI_ENTRY_EX("highlight.bg",                        HL_BG_COLOR,            PHP_INI_ALL,    NULL,                   php_ini_color_displayer_cb)
        PHP_INI_ENTRY_EX("highlight.comment",           HL_COMMENT_COLOR,       PHP_INI_ALL,    NULL,                   php_ini_color_displayer_cb)
        PHP_INI_ENTRY_EX("highlight.default",           HL_DEFAULT_COLOR,       PHP_INI_ALL,    NULL,                   php_ini_color_displayer_cb)
        PHP_INI_ENTRY_EX("highlight.html",                      HL_HTML_COLOR,          PHP_INI_ALL,    NULL,                   php_ini_color_displayer_cb)
@@ -2058,7 +2057,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
                struct {
                        const long error_level;
                        const char *phrase;
-                       const char *directives[5]; /* Remember to change this if the number of directives change */
+                       const char *directives[6]; /* Remember to change this if the number of directives change */
                } directives[] = {
                        {
                                E_CORE_WARNING, 
@@ -2076,6 +2075,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
                                "Directive '%s' is no longer available in PHP", 
                                {
                                        "define_syslog_variables", 
+                                       "highlight.bg", 
                                        "register_globals", 
                                        "register_long_arrays", 
                                        "zend.ze1_compatibility_mode", 

diff --git a/php.ini-development b/php.ini-development
index 10ac9d2a4d99ee1db676c5036bb3b18bd242db18..d316622dd8c2166f09dda09e3a9833890dad1d12 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -387,7 +387,6 @@ disable_classes =
 ;highlight.string  = #DD0000
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700
-;highlight.bg      = #FFFFFF
 ;highlight.default = #0000BB
 ;highlight.html    = #000000
 

diff --git a/php.ini-production b/php.ini-production
index e8fb6d71236c4b19102e0885e9ae8d4c4be26c26..87c8df28887bfa03bec8e993c006fe8ac01069c3 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -387,7 +387,6 @@ disable_classes =
 ;highlight.string  = #DD0000
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700
-;highlight.bg      = #FFFFFF
 ;highlight.default = #0000BB
 ;highlight.html    = #000000
 

diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt
index a283fda6991ec1b5627601fcf2760c6ccc85e08e..7bcb452937deca93c76b84b332aa499e399ec913 100644 (file)
--- a/tests/strings/004.phpt
+++ b/tests/strings/004.phpt
@@ -4,7 +4,6 @@ highlight_string() buffering
 highlight.string=#DD0000
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FFFFFF
 highlight.default=#0000BB
 highlight.html=#000000
 --FILE--

diff --git a/tests/strings/bug26703.phpt b/tests/strings/bug26703.phpt
index ef2d81de4ab662c9a81a6383e621275cb0a5e05c..bea8fb12141cba0c3e58d8ea34d36f7b08479cda 100644 (file)
--- a/tests/strings/bug26703.phpt
+++ b/tests/strings/bug26703.phpt
@@ -4,7 +4,6 @@ Bug #26703 (Certain characters inside strings incorrectly treated as keywords)
 highlight.string=#DD0000
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FFFFFF
 highlight.default=#0000BB
 highlight.html=#000000
 --FILE--