Applied patch by Juliano F. Ravasi for bug 20431: constructor for PPCustomFrame_...

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 3c79dae..673ac24 100644 (file)
--- 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 4769e11..c5d6968 100644 (file)
--- 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;
        }