Fix ugly hack. Assume PHP5 does a nice job with references.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 65dba8c..58b11da 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -46,8 +46,7 @@ class OutputPage {
                $this->mCategoryLinks = array();
                $this->mDoNothing = false;
                $this->mContainsOldMagic = $this->mContainsNewMagic = 0;
-               $nullvalue = NULL;
-               $this->mParserOptions = ParserOptions::newFromUser( $nullvalue );
+               $this->mParserOptions = ParserOptions::newFromUser( NULL );
                $this->mSquidMaxage = 0;
                $this->mScripts = '';
                $this->mETag = false;

diff --git a/includes/Parser.php b/includes/Parser.php
index 45c7569..194e31c 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4561,12 +4561,12 @@ class ParserOptions
         * Get parser options
         * @static
         */
-       static function newFromUser( &$user ) {
+       static function newFromUser( $user ) {
                return new ParserOptions( $user );
        }
 
        /** Get user options */
-       function initialiseFromUser( &$userInput ) {
+       function initialiseFromUser( $userInput ) {
                global $wgUseTeX, $wgUseDynamicDates, $wgInterwikiMagic, $wgAllowExternalImages;
                global $wgAllowExternalImagesFrom, $wgAllowSpecialInclusion;
                $fname = 'ParserOptions::initialiseFromUser';