summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorAnika Henke <a.c.henke@arcor.de>2007-05-18 01:42:28 +0200
committerAnika Henke <a.c.henke@arcor.de>2007-05-18 01:42:28 +0200
commit928a715daa9e74324c60722a0fb8990dca68cdd5 (patch)
tree3468073fb9509aea0d8e5af66ad7a49eb3769fbb /inc
parent07f89c3c8f7bdf32c835189da7cd6e8393ab8570 (diff)
downloadrpg-928a715daa9e74324c60722a0fb8990dca68cdd5.tar.gz
rpg-928a715daa9e74324c60722a0fb8990dca68cdd5.tar.bz2
deleted unnecessary htmlok+phpok checks
darcs-hash:20070517234228-d5083-9a00c354c88dc59ca314ae31baebc612e6577174.gz
Diffstat (limited to 'inc')
-rw-r--r--inc/parser/xhtml.php20
1 files changed, 5 insertions, 15 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 827666ef4..3a1eef3e7 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -336,15 +336,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
* @author Andreas Gohr <andi@splitbrain.org>
*/
function php($text) {
- global $conf;
- if($conf['phpok']){
- ob_start();
- eval($text);
- $this->doc .= ob_get_contents();
- ob_end_clean();
- }else{
- $this->file($text);
- }
+ ob_start();
+ eval($text);
+ $this->doc .= ob_get_contents();
+ ob_end_clean();
}
function phpblock($text) {
@@ -357,12 +352,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
* @author Andreas Gohr <andi@splitbrain.org>
*/
function html($text) {
- global $conf;
- if($conf['htmlok']){
- $this->doc .= $text;
- }else{
- $this->file($text);
- }
+ $this->doc .= $text;
}
function htmlblock($text) {