From 6e03f825b8414f0daf4937eb48d6c894d870943e Mon Sep 17 00:00:00 2001
From: Spring Pierre <pierre.spring@liip.ch>
Date: Thu, 17 Jan 2008 23:26:48 +0100
Subject: remove htmlok and phpok tests from Doku_Handler

there is no necessity for the "htmlok"
and "phpok" testing in the Doku_Handler, taken the fact that the page
renderer does it too. and it gives the possibility to the renderer to
choose, what to do with such blocks.

darcs-hash:20080117222648-01292-cfce862d4e6fe9ce61feda7d6f11f014a68f5ffa.gz
---
 inc/parser/handler.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'inc/parser/handler.php')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 740ccea04..f021691ab 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -268,11 +268,7 @@ class Doku_Handler {
     function php($match, $state, $pos) {
         global $conf;
         if ( $state == DOKU_LEXER_UNMATCHED ) {
-            if ($conf['phpok']) {
-                $this->_addCall('php',array($match), $pos);
-            } else {
-                $this->_addCall('file',array($match), $pos);
-            }
+            $this->_addCall('php',array($match), $pos);
         }
         return true;
     }
@@ -292,11 +288,7 @@ class Doku_Handler {
     function html($match, $state, $pos) {
         global $conf;
         if ( $state == DOKU_LEXER_UNMATCHED ) {
-            if($conf['htmlok']){
-                $this->_addCall('html',array($match), $pos);
-            } else {
-                $this->_addCall('file',array($match), $pos);
-            }
+            $this->_addCall('html',array($match), $pos);
         }
         return true;
     }
-- 
cgit v1.2.3