From 4b13d6b07f2b8c0659b676c2e8f4fd3be46c7f58 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 4 Sep 2009 00:43:51 +0000
Subject: [PATCH] Applied patch by Juliano F. Ravasi for bug 20431: constructor
 for PPCustomFrame_* failed to initialise the object properly.

---
 includes/parser/Preprocessor_DOM.php  | 6 ++----
 includes/parser/Preprocessor_Hash.php | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 3c79dae069..673ac241f3 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -1239,8 +1239,7 @@ class PPTemplateFrame_DOM extends PPFrame_DOM {
 	var $numberedExpansionCache, $namedExpansionCache;
 
 	function __construct( $preprocessor, $parent = false, $numberedArgs = array(), $namedArgs = array(), $title = false ) {
-		$this->preprocessor = $preprocessor;
-		$this->parser = $preprocessor->parser;
+		PPFrame_DOM::__construct( $preprocessor );
 		$this->parent = $parent;
 		$this->numberedArgs = $numberedArgs;
 		$this->namedArgs = $namedArgs;
@@ -1352,8 +1351,7 @@ class PPCustomFrame_DOM extends PPFrame_DOM {
 	var $args;
 
 	function __construct( $preprocessor, $args ) {
-		$this->preprocessor = $preprocessor;
-		$this->parser = $preprocessor->parser;
+		PPFrame_DOM::__construct( $preprocessor );
 		$this->args = $args;
 	}
 
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index 4769e11a6d..c5d69685e4 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -1186,8 +1186,7 @@ class PPTemplateFrame_Hash extends PPFrame_Hash {
 	var $numberedExpansionCache, $namedExpansionCache;
 
 	function __construct( $preprocessor, $parent = false, $numberedArgs = array(), $namedArgs = array(), $title = false ) {
-		$this->preprocessor = $preprocessor;
-		$this->parser = $preprocessor->parser;
+		PPFrame_Hash::__construct( $preprocessor );
 		$this->parent = $parent;
 		$this->numberedArgs = $numberedArgs;
 		$this->namedArgs = $namedArgs;
@@ -1299,8 +1298,7 @@ class PPCustomFrame_Hash extends PPFrame_Hash {
 	var $args;
 
 	function __construct( $preprocessor, $args ) {
-		$this->preprocessor = $preprocessor;
-		$this->parser = $preprocessor->parser;
+		PPFrame_Hash::__construct( $preprocessor );
 		$this->args = $args;
 	}
 
-- 
2.20.1