diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
| commit | fa457f5d82989812f1961cb9643c0b55824ba0b3 (patch) | |
| tree | ea4e6325a9a9d760f6603758449a70ac50cc052d /inc/parser | |
| parent | 4b94edc8e8badb6bcdc25b41f73310a8e323ba92 (diff) | |
| parent | 7951a37379700f564a20c882a920086b49c473c8 (diff) | |
| download | rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.gz rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.bz2 | |
Merge branch 'master' into FS#2867
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/handler.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 1de981b48..8ae991209 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -70,7 +70,7 @@ class Doku_Handler { */ function plugin($match, $state, $pos, $pluginname){ $data = array($match); - $plugin =& plugin_load('syntax',$pluginname); + $plugin = plugin_load('syntax',$pluginname); if($plugin != null){ $data = $plugin->handle($match, $state, $pos, $this); } @@ -653,8 +653,8 @@ function Doku_Handler_Parse_Media($match) { //parse width and height if(preg_match('#(\d+)(x(\d+))?#i',$param,$size)){ - ($size[1]) ? $w = $size[1] : $w = null; - ($size[3]) ? $h = $size[3] : $h = null; + !empty($size[1]) ? $w = $size[1] : $w = null; + !empty($size[3]) ? $h = $size[3] : $h = null; } else { $w = null; $h = null; @@ -1432,6 +1432,7 @@ class Doku_Handler_Table { class Doku_Handler_Block { var $calls = array(); var $skipEol = false; + var $inParagraph = false; // Blocks these should not be inside paragraphs var $blockOpen = array( |