diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 18:39:11 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 18:39:11 +0000 |
| commit | 4e60057c8ccbee18b94a64208311f9bbb338eec6 (patch) | |
| tree | 08d79159aa78693c27f54ecebc3105034dfc5933 /inc/parser/handler.php | |
| parent | 57a6f99d09d3662a8a2ad72e312aa6f53bcc2d01 (diff) | |
| parent | 069942acdaa5ba825bc3f92c7093b5071789f1ca (diff) | |
| download | rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.gz rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.bz2 | |
Merge branch 'master' into tablethead
Diffstat (limited to 'inc/parser/handler.php')
| -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 196cafc57..c4104dac9 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; @@ -1456,6 +1456,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( |