diff options
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/handler.php | 2 | ||||
| -rw-r--r-- | inc/parser/renderer.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php index acca3f5a1..a96e6b9db 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -440,7 +440,7 @@ class Doku_Handler { array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]), $pos ); - }elseif ( preg_match('/^\\\\\\\\[\w.:?\-;,]+?\\\\/u',$link[0]) ) { + }elseif ( preg_match('/^\\\\\\\\[^\\\\]+?\\\\/u',$link[0]) ) { // Windows Share $this->_addCall( 'windowssharelink', diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 7e52cfce2..b54ccf050 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -6,7 +6,6 @@ * @author Andreas Gohr <andi@splitbrain.org> */ if(!defined('DOKU_INC')) die('meh.'); -require_once DOKU_INC . 'inc/parser/renderer.php'; require_once DOKU_INC . 'inc/plugin.php'; require_once DOKU_INC . 'inc/pluginutils.php'; @@ -75,7 +74,9 @@ class Doku_Renderer extends DokuWiki_Plugin { foreach ( $instructions as $instruction ) { // execute the callback against ourself - call_user_func_array(array(&$this, $instruction[0]),$instruction[1]); + if (method_exists($this,$instruction[0])) { + call_user_func_array(array($this, $instruction[0]),$instruction[1]); + } } } |