From 770b6519bedcfdae9fe6debb22b349a61b84ab28 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 29 Oct 2012 19:51:50 +0100 Subject: [PATCH] (Bug 41436) Tone down sanity check, just warn, don't die. This is a follow-up to I9db228c3 fixing an issue with undelete: Page ID 47009 mismatches the ID 47010 provided by the Title object. Backtrace: 0 /var/www/CephWiki/core/includes/Revision.php(188): Revision->__construct(Array) 1 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(548): Revision::newFromArchiveRow(Object(stdClass), Array) 2 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(381): PageArchive->undeleteRevisions(Array, false, '') 3 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(1510): PageArchive->undelete(Array, '', Array, false, Object(User)) 4 /var/www/CephWiki/core/includes/specials/SpecialUndelete.php(778): SpecialUndelete->undelete() 5 /var/www/CephWiki/core/includes/SpecialPage.php(599): SpecialUndelete->execute(NULL) Change-Id: I0517c5826bcba2a85fee596b0473a16da26c3b2f --- includes/Revision.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Revision.php b/includes/Revision.php index 431be69dc1..afba498c28 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -607,7 +607,7 @@ class Revision implements IDBAccessObject { $this->mPage = $this->mTitle->getArticleID(); } elseif ( $this->mTitle->getArticleID() !== $this->mPage ) { // got different page IDs, something is wrong. - throw new MWException( "Page ID " . $this->mPage . " mismatches the ID " + wfWarn( "Page ID " . $this->mPage . " mismatches the ID " . $this->mTitle->getArticleID() . " provided by the Title object." ); } } -- 2.20.1