From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Tue, 18 Aug 2009 10:43:22 +0000 (+0000)
Subject: Fix fatal on every move over redirect, from r53659
X-Git-Tag: 1.31.0-rc.0~40247
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=6bc5dc51a26ec82eecd9e3fb81ac943f4bac3ff6;p=lhc%2Fweb%2Fwiklou.git

Fix fatal on every move over redirect, from r53659

Best not to call methods on variables until after you initialize them.
:)
---

diff --git a/includes/Title.php b/includes/Title.php
index 5e0e53984d..bf02a6f359 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2857,12 +2857,13 @@ class Title {
 		$newid = $nt->getArticleID();
 		$oldid = $this->getArticleID();
 		$latest = $this->getLatestRevID();
+
+		$dbw = wfGetDB( DB_MASTER );
+
 		$rcts = $dbw->timestamp( $nt->getEarliestRevTime() );
 		$newns = $nt->getNamespace();
 		$newdbk = $nt->getDBkey();
 
-		$dbw = wfGetDB( DB_MASTER );
-
 		# Delete the old redirect. We don't save it to history since
 		# by definition if we've got here it's rather uninteresting.
 		# We have to remove it so that the next step doesn't trigger