summaryrefslogtreecommitdiff
path: root/inc/parser/xhtml.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/parser/xhtml.php')
-rw-r--r--inc/parser/xhtml.php18
1 files changed, 13 insertions, 5 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index f033f6082..5e322d839 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -305,10 +305,14 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
* @author Andreas Gohr <andi@splitbrain.org>
*/
function php($text) {
- ob_start();
- eval($text);
- $this->doc .= ob_get_contents();
- ob_end_clean();
+ if($conf['phpok']){
+ ob_start();
+ eval($text);
+ $this->doc .= ob_get_contents();
+ ob_end_clean();
+ } else {
+ $this->code($text, 'php');
+ }
}
function phpblock($text) {
@@ -321,7 +325,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
* @author Andreas Gohr <andi@splitbrain.org>
*/
function html($text) {
- $this->doc .= $text;
+ if($conf['htmlok']){
+ $this->doc .= $text;
+ } else {
+ $this->code($text, 'html4strict');
+ }
}
function htmlblock($text) {