From fb0df8d2e398a634457b317a721734e53596f002 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:19:07 +0300
Subject: [PATCH] [ticket/10665] Moving filter parameters to one array

Moving filter parameters to one array in template compiler class

PHPBB3-10665
---
 phpBB/includes/style/template_compile.php | 34 ++++-------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/phpBB/includes/style/template_compile.php b/phpBB/includes/style/template_compile.php
index bd9e18e102..fa0928f424 100644
--- a/phpBB/includes/style/template_compile.php
+++ b/phpBB/includes/style/template_compile.php
@@ -32,25 +32,6 @@ class phpbb_style_template_compile
 	*/
 	private $filter_params;
 
-	/**
-	* Whether <!-- PHP --> tags are allowed
-	*
-	* @var bool
-	*/
-	private $allow_php;
-
-	/**
-	* Style resource locator
-	*
-	* @var phpbb_style_resource_locator
-	*/
-	private $locator;
-
-	/**
-	* @var string phpBB root path
-	*/
-	private $phpbb_root_path;
-
 	/**
 	* Constructor.
 	*
@@ -60,10 +41,11 @@ class phpbb_style_template_compile
 	*/
 	public function __construct($allow_php, $locator, $phpbb_root_path)
 	{
-		$this->filter_params = array();
-		$this->allow_php = $allow_php;
-		$this->locator = $locator;
-		$this->phpbb_root_path = $phpbb_root_path;
+		$this->filter_params = array(
+			'allow_php'	=> $allow_php,
+			'locator'	=> $locator,
+			'phpbb_root_path'	=> $phpbb_root_path
+		);
 	}
 
 	/**
@@ -140,11 +122,7 @@ class phpbb_style_template_compile
 	*/
 	private function compile_stream_to_stream($source_stream, $dest_stream)
 	{
-		$params = $this->filter_params;
-		$params['allow_php'] = $this->allow_php;
-		$params['locator'] = $this->locator;
-		$params['phpbb_root_path'] = $this->phpbb_root_path;
-		stream_filter_append($source_stream, 'phpbb_template', null, $params);
+		stream_filter_append($source_stream, 'phpbb_template', null, $this->filter_params);
 		stream_copy_to_stream($source_stream, $dest_stream);
 	}
 }