diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-10-20 11:30:51 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-20 11:30:51 -0700 |
| commit | d9529222b05d3366179c8a5bbd6d717664b98de0 (patch) | |
| tree | 7789b8bc9ee9405f0ce33ff19dad5d15fb9b6207 /inc/parser/handler.php | |
| parent | 9f5b9cf15569babaa90f0d6f3dd58cefd5439bc5 (diff) | |
| parent | e07886c01389351f28a254ef6f7c9611453508fb (diff) | |
| download | rpg-d9529222b05d3366179c8a5bbd6d717664b98de0.tar.gz rpg-d9529222b05d3366179c8a5bbd6d717664b98de0.tar.bz2 | |
Merge pull request #380 from splitbrain/phpstrict
Php strict
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 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( |