| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -111,7 +111,6 @@ |
| 112 | 112 | // in this path. Used for loop detection. |
| 113 | 113 | |
| 114 | 114 | var $mIWTransData = array(); |
| 115 | | - var $mAssocArgs = array(); |
| 116 | 115 | |
| 117 | 116 | /**#@-*/ |
| 118 | 117 | |
| — | — | @@ -2246,7 +2245,6 @@ |
| 2247 | 2246 | if ( $this->mOutputType == OT_HTML && !$found ) { |
| 2248 | 2247 | $text = '[['.$title->getPrefixedText().']]'; |
| 2249 | 2248 | $found = true; |
| 2250 | | - } |
| 2251 | 2249 | |
| 2252 | 2250 | # Template cache array insertion |
| 2253 | 2251 | if( $found ) { |
| — | — | @@ -2262,12 +2260,12 @@ |
| 2263 | 2261 | $text = wfEscapeWikiText( $text ); |
| 2264 | 2262 | } elseif ( ($this->mOutputType == OT_HTML || $this->mOutputType == OT_WIKI) && $found && !$noparse) { |
| 2265 | 2263 | # Clean up argument array |
| 2266 | | - $this->mAssocArgs = array(); |
| | 2264 | + $assocArgs = array(); |
| 2267 | 2265 | $index = 1; |
| 2268 | 2266 | foreach( $args as $arg ) { |
| 2269 | 2267 | $eqpos = strpos( $arg, '=' ); |
| 2270 | 2268 | if ( $eqpos === false ) { |
| 2271 | | - $this->mAssocArgs[$index++] = $arg; |
| | 2269 | + $assocArgs[$index++] = $arg; |
| 2272 | 2270 | } else { |
| 2273 | 2271 | $name = trim( substr( $arg, 0, $eqpos ) ); |
| 2274 | 2272 | $value = trim( substr( $arg, $eqpos+1 ) ); |
| — | — | @@ -2275,7 +2273,7 @@ |
| 2276 | 2274 | $value = ''; |
| 2277 | 2275 | } |
| 2278 | 2276 | if ( $name !== false ) { |
| 2279 | | - $this->mAssocArgs[$name] = $value; |
| | 2277 | + $assocArgs[$name] = $value; |
| 2280 | 2278 | } |
| 2281 | 2279 | } |
| 2282 | 2280 | } |
| — | — | @@ -2289,9 +2287,9 @@ |
| 2290 | 2288 | $text = strtr( $text, array( '<includeonly>' => '' , '</includeonly>' => '' ) ); |
| 2291 | 2289 | # Strip <nowiki>, <pre>, etc. |
| 2292 | 2290 | $text = $this->strip( $text, $this->mStripState ); |
| 2293 | | - $text = Sanitizer::removeHTMLtags( $text, array( &$this, 'replaceVariables' ), $this->mAssocArgs ); |
| | 2291 | + $text = Sanitizer::removeHTMLtags( $text, array( &$this, 'replaceVariables' ), $assocArgs ); |
| 2294 | 2292 | } |
| 2295 | | - $text = $this->replaceVariables( $text, $this->mAssocArgs ); |
| | 2293 | + $text = $this->replaceVariables( $text, $assocArgs ); |
| 2296 | 2294 | |
| 2297 | 2295 | # Resume the link cache and register the inclusion as a link |
| 2298 | 2296 | if ( $this->mOutputType == OT_HTML && !is_null( $title ) ) { |