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/plugin.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/plugin.php')
| -rw-r--r-- | inc/plugin.php | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/inc/plugin.php b/inc/plugin.php index dccd37bd9..95bdaee2b 100644 --- a/inc/plugin.php +++ b/inc/plugin.php @@ -239,10 +239,35 @@ class DokuWiki_Plugin { } /** + * A fallback to provide access to the old render() method + * + * Since syntax plugins provide their own render method with a different signature and they now + * inherit from Doku_Plugin we can no longer have a render() method here (Strict Standards Violation). + * Instead use render_text() + * + * @deprecated 2014-01-22 + * @param $name + * @param $arguments + * @return null|string + */ + function __call($name, $arguments) { + if($name == 'render'){ + if(!isset($arguments[1])) $arguments[1] = 'xhtml'; + return $this->render_text($arguments[0], $arguments[1]); + } + trigger_error("no such method $name", E_ERROR); + return null; + } + + /** * output text string through the parser, allows dokuwiki markup to be used * very ineffecient for small pieces of data - try not to use + * + * @param string $text wiki markup to parse + * @param string $format output format + * @return null|string */ - function render($text, $format='xhtml') { + function render_text($text, $format='xhtml') { return p_render($format, p_get_instructions($text),$info); } |