Permalink
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>
  • Loading branch information...
andreashaerter committed Feb 8, 2014
1 parent 4c65b9a commit fede5d71fee68bd0c02c6c46f9df4ab4dab16e25
Showing with 0 additions and 161 deletions.
  1. +0 −9 README
  2. +0 −125 bug49642.php
  3. +0 −9 main.php
  4. +0 −9 mediamanager.php
  5. +0 −9 style.ini
View
9 README
@@ -18,16 +18,8 @@
See the vector template website for update instructions [2].
NOTE: If everything will be displayed unformatted, your PHP environment is
probably affected by PHP bug #49692 [3]. You may find errors like
"syntax error, unexpected '/' in ../../lib/tpl/vector/style.ini on
line XX" in your PHP logs when this is the case. vector provides a
workaround for this, simply delete vector's "style.ini" to trigger
the template to use it.
[1] <https://www.dokuwiki.org/template>
[2] <https://www.dokuwiki.org/template:vector#update>
[3] <http://bugs.php.net/bug.php?id=49692>
@@ -236,7 +228,6 @@
- replaced "monobook" through "vector" in:
- /conf/*
- /lang/*
- /bug49642.php
- /detail.php
- /inc_cite.php
- /inc_detail.php
View

This file was deleted.

Oops, something went wrong.
View
@@ -425,15 +425,6 @@ function _vector_renderButtons($arr)
tpl_metaheaders();
echo "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\" />";
//manually load needed CSS? this is a workaround for PHP Bug #49642. In some
//version/os combinations PHP is not able to parse INI-file entries if there
//are slashes "/" used for the keynames (see bugreport for more information:
//<http://bugs.php.net/bug.php?id=49692>). to trigger this workaround, simply
//delete/rename vector's style.ini.
if (!file_exists(DOKU_TPLINC."style.ini")){
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
}
//include default or userdefined favicon
//
//note: since 2011-04-22 "Rincewind RC1", there is a core function named
View
@@ -33,15 +33,6 @@
tpl_metaheaders();
echo "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1\" />";
//manually load needed CSS? this is a workaround for PHP Bug #49642. In some
//version/os combinations PHP is not able to parse INI-file entries if there
//are slashes "/" used for the keynames (see bugreport for more information:
//<http://bugs.php.net/bug.php?id=49692>). to trigger this workaround, simply
//delete/rename vector's style.ini.
if (!file_exists(DOKU_TPLINC."style.ini")){
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
}
//include default or userdefined favicon
//
//note: since 2011-04-22 "Rincewind RC1", there is a core function named
View
@@ -27,8 +27,6 @@
[stylesheets]
; screen
; note to myself: don't forget to respect the workaround within "bug49642.php"
; when adding new screen styles.
; load the DokuWiki styles. See <http://j.mp/eq8zSo> why I am doing this.
static/3rd/dokuwiki/_imgdetail.css = screen
static/3rd/dokuwiki/_media_popup.css = screen
@@ -60,8 +58,6 @@ user/screen.css = screen
; I think this function is silly (cause therefore we got
; different "media" but some people *always* searching for such
; print version links). Good text about this: <http://j.mp/6r3Kgf>
; note to myself: don't forget to respect the workaround within "bug49642.php"
; when adding new print styles.
; load the DokuWiki styles. See <http://j.mp/eq8zSo> why I am doing this.
static/3rd/dokuwiki/print.css = print
@@ -71,9 +67,6 @@ user/print.css = print
; right-to-left
; note to myself: don't forget to respect the workaround within "bug49642.php"
; when adding new rtl styles.
; load the most important MediaWiki vector styles
static/3rd/vector/main-rtl.css = rtl
@@ -93,8 +86,6 @@ user/rtl.css = rtl
;------ guaranteed dokuwiki color placeholders that every plugin can use
; main text and background colors
;
;note to myself: don't forget to respect the workaround within "bug49642.php"
; when changing values in here.
__text__ = "#000"
__background__ = "#fff"
; alternative text and background colors

0 comments on commit fede5d7

Please sign in to comment.