Catrope has submitted this change and it was merged.

Change subject: Fix fatal in 112d817
......................................................................


Fix fatal in 112d817

Need to call ->load() before accessing ->article

Change-Id: Ibe967f22ba636d630731eb3591147b21ed05626e
(cherry picked from commit 48facef9f4ba77568c786fbd48823c5a8a35e8fd)
---
M frontend/FlaggablePageView.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 7e3cee8..1bbf6c9 100644
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -915,13 +915,13 @@
                // HACK: EditPage invokes addToEditView() before this function, 
so $this->noticesDone
                // will only be true if we're being called by EditPage, in 
which case we need to do nothing
                // to avoid duplicating the notices.
+               $this->load();
                if ( $this->noticesDone || !$this->article->isReviewable() ) {
                        return;
                }
                // HACK fake EditPage
                $editPage = new EditPage( new Article( $title, $oldid ) );
                $editPage->oldid = $oldid;
-               $this->load();
                $reqUser = $this->getUser();
 
                // HACK this duplicates logic from addToEditView()

-- 
To view, visit https://gerrit.wikimedia.org/r/75655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe967f22ba636d630731eb3591147b21ed05626e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.22wmf11
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to