From 7d158675b29acadcb5dc48a4367f7609ee0ea494 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 8 Feb 2011 13:31:30 +0000
Subject: [PATCH] Tweak for r79018: fatal errors due to something calling
 parser clearState when mOptions wasn't defined

---
 includes/parser/Parser.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b7c63bfc17..9d9ccad881 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -194,7 +194,9 @@ class Parser {
 			$this->firstCallInit();
 		}
 		$this->mOutput = new ParserOutput;
-		$this->mOptions->registerWatcher( array( $this->mOutput, 'recordOption' ) );
+		if( $this->mOptions ) {
+			$this->mOptions->registerWatcher( array( $this->mOutput, 'recordOption' ) );
+		}
 		$this->mAutonumber = 0;
 		$this->mLastSection = '';
 		$this->mDTopen = false;
-- 
2.20.1