SpecialVersion: Handle Closures in $wgHooks nicer

[lhc/web/wiklou.git] / includes / TemplateParser.php

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 3de70fa..f0a1ebb 100644 (file)
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -130,7 +130,8 @@ class TemplateParser {
                if ( !is_callable( $renderer ) ) {
                        throw new RuntimeException( "Requested template, {$templateName}, is not callable" );
                }
-               return $this->renderers[$templateName] = $renderer;
+               $this->renderers[$templateName] = $renderer;
+               return $renderer;
        }
 
        /**
@@ -172,7 +173,9 @@ class TemplateParser {
                        array(
                                // Do not add more flags here without discussion.
                                // If you do add more flags, be sure to update unit tests as well.
-                               'flags' => LightnCandy::FLAG_ERROR_EXCEPTION
+                               'flags' => LightnCandy::FLAG_ERROR_EXCEPTION,
+                               'basedir' => $this->templateDir,
+                               'fileext' => '.mustache',
                        )
                );
        }