summaryrefslogtreecommitdiff
path: root/inc/parser/handler.php
diff options
context:
space:
mode:
authorSpring Pierre <pierre.spring@liip.ch>2008-01-17 23:26:48 +0100
committerSpring Pierre <pierre.spring@liip.ch>2008-01-17 23:26:48 +0100
commit6e03f825b8414f0daf4937eb48d6c894d870943e (patch)
tree65a7a7da49043959ddbed5c789a32e47b091876c /inc/parser/handler.php
parenta249961def6b81c4fb6048789d91c8c03fbb881b (diff)
downloadrpg-6e03f825b8414f0daf4937eb48d6c894d870943e.tar.gz
rpg-6e03f825b8414f0daf4937eb48d6c894d870943e.tar.bz2
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
Diffstat (limited to 'inc/parser/handler.php')
-rw-r--r--inc/parser/handler.php12
1 files changed, 2 insertions, 10 deletions
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;
}