Localisation updates for core and extension messages from translatewiki.net (2010...

[lhc/web/wiklou.git] / includes / parser / Preprocessor_DOM.php

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index bd33c10..673ac24 100644 (file)
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -419,7 +419,8 @@ class Preprocessor_DOM implements Preprocessor {
                                                'count' => $count );
                                        $stack->push( $piece );
                                        $accum =& $stack->getAccum();
-                                       extract( $stack->getFlags() );
+                                       $flags = $stack->getFlags();
+                                       extract( $flags );
                                        $i += $count;
                                }
                        }
@@ -470,7 +471,8 @@ class Preprocessor_DOM implements Preprocessor {
                                // Unwind the stack
                                $stack->pop();
                                $accum =& $stack->getAccum();
-                               extract( $stack->getFlags() );
+                               $flags = $stack->getFlags();
+                               extract( $flags );
 
                                // Append the result to the enclosing accumulator
                                $accum .= $element;
@@ -497,7 +499,8 @@ class Preprocessor_DOM implements Preprocessor {
 
                                        $stack->push( $piece );
                                        $accum =& $stack->getAccum();
-                                       extract( $stack->getFlags() );
+                                       $flags = $stack->getFlags();
+                                       extract( $flags );
                                } else {
                                        # Add literal brace(s)
                                        $accum .= htmlspecialchars( str_repeat( $curChar, $count ) );
@@ -597,8 +600,8 @@ class Preprocessor_DOM implements Preprocessor {
                                        }
                                        $enclosingAccum .= str_repeat( $piece->open, $skippedBraces );
                                }
-
-                               extract( $stack->getFlags() );
+                               $flags = $stack->getFlags();
+                               extract( $flags );
 
                                # Add XML element to the enclosing accumulator
                                $accum .= $element;
@@ -873,7 +876,6 @@ class PPFrame_DOM implements PPFrame {
                if ( is_string( $root ) ) {
                        return $root;
                }
-               wfProfileIn( __METHOD__ );
 
                if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->mMaxPPNodeCount )
                {
@@ -883,6 +885,7 @@ class PPFrame_DOM implements PPFrame {
                if ( $expansionDepth > $this->parser->mOptions->mMaxPPExpandDepth ) {
                        return '<span class="error">Expansion depth limit exceeded</span>';
                }
+               wfProfileIn( __METHOD__ );
                ++$expansionDepth;
 
                if ( $root instanceof PPNode_DOM ) {
@@ -1189,6 +1192,18 @@ class PPFrame_DOM implements PPFrame {
                }
        }
 
+       function getArguments() {
+               return array();
+       }
+
+       function getNumberedArguments() {
+               return array();
+       }
+
+       function getNamedArguments() {
+               return array();
+       }
+
        /**
         * Returns true if there are no arguments in this frame
         */
@@ -1224,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;
@@ -1337,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;
        }