Version 4.5.0

applications/cms/sources/Theme/Template.php

@@ -12,7 +12,7 @@
 namespace IPS\cms\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;
@@ -108,7 +108,7 @@ class _Template extends \IPS\Theme\Template
 			$functionName = "theme_{$this->app}_{$this->templateLocation}_{$this->templateName}_{$bit}";
 	
 			/* If it doesn't exist, build it */
-			if( !function_exists( 'IPS\\Theme\\'.$functionName ) )
+			if( !\function_exists( 'IPS\\Theme\\'.$functionName ) )
 			{
 				/* Find the file */
 				$file = $this->sourceFolder . $bit . '.phtml';
@@ -149,7 +149,8 @@ class _Template extends \IPS\Theme\Template
 			
 			/* Run it */
 			ob_start();
-			$return = call_user_func_array( 'IPS\\Theme\\'.$functionName, $params );
+			$template = 'IPS\\Theme\\'.$functionName;
+			$return = $template( ...$params );
 			if( $error = ob_get_clean() )
 			{
 				echo "<strong>{$functionName}</strong><br>{$error}<br><br><pre>{$output}";