1 files changed, 5 insertions, 1 deletions
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 709f063da..849c6f0ea 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -34,7 +34,7 @@ $PARSER_MODES = array(
 
     // modes which have a start and end token but inside which
     // no other modes should be applied
-    'protected'    => array('preformatted','code','file','php','html'),
+    'protected'    => array('preformatted','code','file','php','html','htmlblock','phpblock'),
 
     // inside this mode no wiki markup should be applied but lineendings
     // and whitespace isn't preserved
@@ -489,10 +489,12 @@ class Doku_Parser_Mode_php extends Doku_Parser_Mode {
 
     function connectTo($mode) {
         $this->Lexer->addEntryPattern('<php>(?=.*</php>)',$mode,'php');
+        $this->Lexer->addEntryPattern('<PHP>(?=.*</PHP>)',$mode,'phpblock');
     }
 
     function postConnect() {
         $this->Lexer->addExitPattern('</php>','php');
+        $this->Lexer->addExitPattern('</PHP>','phpblock');
     }
 
     function getSort() {
@@ -505,10 +507,12 @@ class Doku_Parser_Mode_html extends Doku_Parser_Mode {
 
     function connectTo($mode) {
         $this->Lexer->addEntryPattern('<html>(?=.*</html>)',$mode,'html');
+        $this->Lexer->addEntryPattern('<HTML>(?=.*</HTML>)',$mode,'htmlblock');
     }
 
     function postConnect() {
         $this->Lexer->addExitPattern('</html>','html');
+        $this->Lexer->addExitPattern('</HTML>','htmlblock');
     }
 
     function getSort() {