Some new strictness with PHP5

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8de5372..65dba8c 100644 (file)
--- 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 8a6314d..963c741 100644 (file)
--- 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;