Skip to content

Commit fede5d7

Browse files
Remove workaround for PHP bug #49692
PHP bug #49692 [1] affects only PHP 5.3.0 and was fixed in PHP 5.3.1. I think it is time to remove the workaround as PHP version 5.3.0 is end-of-life for a long time now and even Debian old-stable comes with PHP 5.3.3. [1] <http://bugs.php.net/bug.php?id=49692>
1 parent 4c65b9a commit fede5d7

File tree

5 files changed

+0
-161
lines changed

5 files changed

+0
-161
lines changed

README

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,8 @@
1818

1919
See the vector template website for update instructions [2].
2020

21-
NOTE: If everything will be displayed unformatted, your PHP environment is
22-
probably affected by PHP bug #49692 [3]. You may find errors like
23-
"syntax error, unexpected '/' in ../../lib/tpl/vector/style.ini on
24-
line XX" in your PHP logs when this is the case. vector provides a
25-
workaround for this, simply delete vector's "style.ini" to trigger
26-
the template to use it.
27-
2821
[1] <https://www.dokuwiki.org/template>
2922
[2] <https://www.dokuwiki.org/template:vector#update>
30-
[3] <http://bugs.php.net/bug.php?id=49692>
3123

3224

3325

@@ -236,7 +228,6 @@
236228
- replaced "monobook" through "vector" in:
237229
- /conf/*
238230
- /lang/*
239-
- /bug49642.php
240231
- /detail.php
241232
- /inc_cite.php
242233
- /inc_detail.php

bug49642.php

Lines changed: 0 additions & 125 deletions
This file was deleted.

main.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -425,15 +425,6 @@ function _vector_renderButtons($arr)
425425
tpl_metaheaders();
426426
echo "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\" />";
427427

428-
//manually load needed CSS? this is a workaround for PHP Bug #49642. In some
429-
//version/os combinations PHP is not able to parse INI-file entries if there
430-
//are slashes "/" used for the keynames (see bugreport for more information:
431-
//<http://bugs.php.net/bug.php?id=49692>). to trigger this workaround, simply
432-
//delete/rename vector's style.ini.
433-
if (!file_exists(DOKU_TPLINC."style.ini")){
434-
echo "<link rel=\"stylesheet\" media=\"all\" type=\"text/css\" href=\"".DOKU_TPL."bug49642.php".((!empty($lang["direction"]) && $lang["direction"] === "rtl") ? "?langdir=rtl" : "")."\" />\n"; //var comes from DokuWiki core
435-
}
436-
437428
//include default or userdefined favicon
438429
//
439430
//note: since 2011-04-22 "Rincewind RC1", there is a core function named

mediamanager.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
tpl_metaheaders();
3434
echo "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\" />";
3535

36-
//manually load needed CSS? this is a workaround for PHP Bug #49642. In some
37-
//version/os combinations PHP is not able to parse INI-file entries if there
38-
//are slashes "/" used for the keynames (see bugreport for more information:
39-
//<http://bugs.php.net/bug.php?id=49692>). to trigger this workaround, simply
40-
//delete/rename vector's style.ini.
41-
if (!file_exists(DOKU_TPLINC."style.ini")){
42-
echo "<link rel=\"stylesheet\" media=\"all\" type=\"text/css\" href=\"".DOKU_TPL."bug49642.php".((!empty($lang["direction"]) && $lang["direction"] === "rtl") ? "?langdir=rtl" : "")."\" />\n"; //var comes from DokuWiki core
43-
}
44-
4536
//include default or userdefined favicon
4637
//
4738
//note: since 2011-04-22 "Rincewind RC1", there is a core function named

style.ini

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
[stylesheets]
2929
; screen
30-
; note to myself: don't forget to respect the workaround within "bug49642.php"
31-
; when adding new screen styles.
3230
; load the DokuWiki styles. See <http://j.mp/eq8zSo> why I am doing this.
3331
static/3rd/dokuwiki/_imgdetail.css = screen
3432
static/3rd/dokuwiki/_media_popup.css = screen
@@ -60,8 +58,6 @@ user/screen.css = screen
6058
; I think this function is silly (cause therefore we got
6159
; different "media" but some people *always* searching for such
6260
; print version links). Good text about this: <http://j.mp/6r3Kgf>
63-
; note to myself: don't forget to respect the workaround within "bug49642.php"
64-
; when adding new print styles.
6561
; load the DokuWiki styles. See <http://j.mp/eq8zSo> why I am doing this.
6662
static/3rd/dokuwiki/print.css = print
6763

@@ -71,9 +67,6 @@ user/print.css = print
7167

7268

7369
; right-to-left
74-
; note to myself: don't forget to respect the workaround within "bug49642.php"
75-
; when adding new rtl styles.
76-
7770
; load the most important MediaWiki vector styles
7871
static/3rd/vector/main-rtl.css = rtl
7972

@@ -93,8 +86,6 @@ user/rtl.css = rtl
9386
;------ guaranteed dokuwiki color placeholders that every plugin can use
9487
; main text and background colors
9588
;
96-
;note to myself: don't forget to respect the workaround within "bug49642.php"
97-
; when changing values in here.
9889
__text__ = "#000"
9990
__background__ = "#fff"
10091
; alternative text and background colors

0 commit comments

Comments
 (0)