Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332001 )

Change subject: [WIP] EditPage#handleStatus: Don't add yet another Status 
object on hook fatals
......................................................................

[WIP] EditPage#handleStatus: Don't add yet another Status object on hook fatals

We're already dealing with a fatal error. No need to add a second, less-specific
fatal on top of the one we've now got.

Change-Id: I7826f2ebb40a276aeb7a4b395d3ee3d9566ac38b
---
M includes/EditPage.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/332001/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index acbd130..bbdc692 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1660,7 +1660,6 @@
                        # ...or the hook could be expecting us to produce an 
error
                        // FIXME this sucks, we should just use the Status 
object throughout
                        $this->hookError = $status->getWikiText();
-                       $status->fatal( 'hookaborted' );
                        $status->value = self::AS_HOOK_ERROR_EXPECTED;
                        return false;
                }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7826f2ebb40a276aeb7a4b395d3ee3d9566ac38b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to