From: kaldari <rkaldari@wikimedia.org>
Date: Fri, 20 Mar 2015 00:09:13 +0000 (-0700)
Subject: Make sure template function is callable from processTemplate()
X-Git-Tag: 1.31.0-rc.0~12031^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=2a8992a8b9d174cfbbd3030dfc872a9a50dccf2c;p=lhc%2Fweb%2Fwiklou.git

Make sure template function is callable from processTemplate()

Change-Id: Id9df4062754b02e7217779bc6c0ba42d457e9942
---

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index a22f2801d9..65904a01e0 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -79,7 +79,7 @@ class TemplateParser {
 	 */
 	public function getTemplate( $templateName ) {
 		// If a renderer has already been defined for this template, reuse it
-		if ( isset( $this->renderers[$templateName] ) ) {
+		if ( isset( $this->renderers[$templateName] ) && is_callable( $this->renderers[$templateName] ) ) {
 			return $this->renderers[$templateName];
 		}
 
@@ -134,6 +134,9 @@ class TemplateParser {
 		}
 
 		$renderer = eval( $code );
+		if ( !is_callable( $renderer ) ) {
+			throw new RuntimeException( "Requested template, {$templateName}, is not callable" );
+		}
 		return $this->renderers[$templateName] = $renderer;
 	}