From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 11 Jul 2006 14:03:17 +0000 (+0000)
Subject: Some new strictness with PHP5
X-Git-Tag: 1.31.0-rc.0~56306
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=ab8b197963eef1f1ad1efce38423242555a9e6ea;p=lhc%2Fweb%2Fwiklou.git

Some new strictness with PHP5
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8de5372a5d..65dba8cbeb 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -46,7 +46,8 @@ class OutputPage {
 		$this->mCategoryLinks = array();
 		$this->mDoNothing = false;
 		$this->mContainsOldMagic = $this->mContainsNewMagic = 0;
-		$this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
+		$nullvalue = NULL;
+		$this->mParserOptions = ParserOptions::newFromUser( $nullvalue );
 		$this->mSquidMaxage = 0;
 		$this->mScripts = '';
 		$this->mETag = false;
diff --git a/includes/Parser.php b/includes/Parser.php
index 8a6314dfe7..963c741b0c 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4072,7 +4072,8 @@ class Parser
 			if ( count( $matches ) == 0 ) {
 				continue;
 			}
-			$nt =& Title::newFromText( $matches[1] );
+			$tp = Title::newFromText( $matches[1] );
+			$nt =& $tp;
 			if( is_null( $nt ) ) {
 				# Bogus title. Ignore these so we don't bomb out later.
 				continue;