kalle Wed, 21 Apr 2010 21:56:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298274
Log:
Remove highlight.bg, it was removed in the old trunk and its not referenced in
zend_highlight.c, meaning its not even implemented correctly in 5.3.
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/Zend/tests/bug35655.phpt
U php/php-src/trunk/Zend/tests/bug42767.phpt
U php/php-src/trunk/Zend/tests/nowdoc_013.phpt
U php/php-src/trunk/Zend/tests/nowdoc_014.phpt
U php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
U php/php-src/trunk/main/main.c
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
U php/php-src/trunk/tests/strings/004.phpt
U php/php-src/trunk/tests/strings/bug26703.phpt
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2010-04-21 20:18:32 UTC (rev 298273)
+++ php/php-src/trunk/NEWS 2010-04-21 21:56:24 UTC (rev 298274)
@@ -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.
Modified: php/php-src/trunk/Zend/tests/bug35655.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/bug35655.phpt 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/Zend/tests/bug35655.phpt 2010-04-21 21:56:24 UTC (rev
298274)
@@ -4,7 +4,6 @@
highlight.string = #DD0000
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FFFFFF
highlight.default = #0000BB
highlight.html = #000000
--FILE--
Modified: php/php-src/trunk/Zend/tests/bug42767.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/bug42767.phpt 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/Zend/tests/bug42767.phpt 2010-04-21 21:56:24 UTC (rev
298274)
@@ -4,7 +4,6 @@
highlight.string = #DD0000
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FFFFFF
highlight.default = #0000BB
highlight.html = #000000
--FILE--
Modified: php/php-src/trunk/Zend/tests/nowdoc_013.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/nowdoc_013.phpt 2010-04-21 20:18:32 UTC
(rev 298273)
+++ php/php-src/trunk/Zend/tests/nowdoc_013.phpt 2010-04-21 21:56:24 UTC
(rev 298274)
@@ -4,7 +4,6 @@
highlight.string = #DD0000
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FFFFFF
highlight.default = #0000BB
highlight.html = #000000
--FILE--
Modified: php/php-src/trunk/Zend/tests/nowdoc_014.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/nowdoc_014.phpt 2010-04-21 20:18:32 UTC
(rev 298273)
+++ php/php-src/trunk/Zend/tests/nowdoc_014.phpt 2010-04-21 21:56:24 UTC
(rev 298274)
@@ -4,7 +4,6 @@
highlight.string = #DD0000
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FFFFFF
highlight.default = #0000BB
highlight.html = #000000
--FILE--
Modified: php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
2010-04-21 20:18:32 UTC (rev 298273)
+++ php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
2010-04-21 21:56:24 UTC (rev 298274)
@@ -4,7 +4,6 @@
highlight.string=#DD0000
highlight.comment=#FF9900
highlight.keyword=#007700
-highlight.bg=#FFFFFF
highlight.default=#0000BB
highlight.html=#000000
allow_url_include=1
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-04-21 20:18:32 UTC (rev 298273)
+++ php/php-src/trunk/main/main.c 2010-04-21 21:56:24 UTC (rev 298274)
@@ -425,7 +425,6 @@
/* {{{ 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 @@
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 @@
"Directive '%s' is no longer available in PHP",
{
"define_syslog_variables",
+ "highlight.bg",
"register_globals",
"register_long_arrays",
"zend.ze1_compatibility_mode",
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/php.ini-development 2010-04-21 21:56:24 UTC (rev
298274)
@@ -387,7 +387,6 @@
;highlight.string = #DD0000
;highlight.comment = #FF9900
;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
;highlight.default = #0000BB
;highlight.html = #000000
Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/php.ini-production 2010-04-21 21:56:24 UTC (rev
298274)
@@ -387,7 +387,6 @@
;highlight.string = #DD0000
;highlight.comment = #FF9900
;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
;highlight.default = #0000BB
;highlight.html = #000000
Modified: php/php-src/trunk/tests/strings/004.phpt
===================================================================
--- php/php-src/trunk/tests/strings/004.phpt 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/tests/strings/004.phpt 2010-04-21 21:56:24 UTC (rev
298274)
@@ -4,7 +4,6 @@
highlight.string=#DD0000
highlight.comment=#FF9900
highlight.keyword=#007700
-highlight.bg=#FFFFFF
highlight.default=#0000BB
highlight.html=#000000
--FILE--
Modified: php/php-src/trunk/tests/strings/bug26703.phpt
===================================================================
--- php/php-src/trunk/tests/strings/bug26703.phpt 2010-04-21 20:18:32 UTC
(rev 298273)
+++ php/php-src/trunk/tests/strings/bug26703.phpt 2010-04-21 21:56:24 UTC
(rev 298274)
@@ -4,7 +4,6 @@
highlight.string=#DD0000
highlight.comment=#FF9900
highlight.keyword=#007700
-highlight.bg=#FFFFFF
highlight.default=#0000BB
highlight.html=#000000
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
