Version 4.5.0

system/Theme/SandboxedTemplate.php

@@ -11,7 +11,7 @@
 namespace IPS\Theme;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -30,7 +30,7 @@ class _SandboxedTemplate
 	/**
 	 * Contructor
 	 *
-	 * @param	\IPS\Theme\Template	$template
+	 * @param	\IPS\Theme\Template	$template	Template to use
 	 * @return	void
 	 */
 	public function __construct( $template )
@@ -41,7 +41,9 @@ class _SandboxedTemplate
 	/**
 	 * Call
 	 *
-	 * @return string
+	 * @param	string	$name	Method name
+	 * @param	array	$args	Method arguments
+	 * @return	string
 	 */
 	public function __call( $name, $args )
 	{
@@ -49,7 +51,8 @@ class _SandboxedTemplate
 		{
 			if ( !method_exists( $this->template, $name ) )
 			{
-				return "<span style='background:black;color:white;padding:6px;'>[[Template {$this->template->app}/{$this->template->templateLocation}/{$this->template->templateName}/{$name} does not exist. This theme may be out of date. Run the support tool in the AdminCP to restore the default theme.]]</span>";
+				/* It doesn't exist in this theme or master, so ignore, as it's likely been removed from master during an upgrade */
+				return '';
 			}
 			else
 			{