diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | Zend/tests/bug35655.phpt | 1 | ||||
| -rw-r--r-- | Zend/tests/bug42767.phpt | 1 | ||||
| -rw-r--r-- | Zend/tests/nowdoc_013.phpt | 1 | ||||
| -rw-r--r-- | Zend/tests/nowdoc_014.phpt | 1 | ||||
| -rw-r--r-- | ext/standard/tests/strings/highlight_file.phpt | 1 | ||||
| -rw-r--r-- | main/main.c | 4 | ||||
| -rw-r--r-- | php.ini-development | 1 | ||||
| -rw-r--r-- | php.ini-production | 1 | ||||
| -rw-r--r-- | tests/strings/004.phpt | 1 | ||||
| -rw-r--r-- | tests/strings/bug26703.phpt | 1 |
11 files changed, 3 insertions, 11 deletions
@@ -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 10d9c0c746..bbb137799a 100755 --- 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 484918cdb7..b57177e4b5 100644 --- 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 f4ee251749..3e7d41fe07 100644 --- 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 b8948699f8..694490b17d 100644 --- 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 709e57dc00..d1a0323c58 100644 --- 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 63469f530f..ccf618ce80 100644 --- 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 10ac9d2a4d..d316622dd8 100644 --- 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 e8fb6d7123..87c8df2888 100644 --- 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 a283fda699..7bcb452937 100644 --- 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 ef2d81de4a..bea8fb1214 100644 --- 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-- |