jenkins-bot has submitted this change and it was merged.

Change subject: Stop tracing redirects on invalid content
......................................................................


Stop tracing redirects on invalid content

Bug: 68558
Change-Id: I91f7ae0d24a6977f05fc316bec5a1dbd49f7e75e
---
M includes/Updater.php
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Updater.php b/includes/Updater.php
index eab7213..2660792 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -118,6 +118,10 @@
                        if ( is_string( $content ) ) {
                                $content = new TextContent( $content );
                        }
+                       // If the event that the content is _still_ not usable, 
we have to give up.
+                       if ( !is_object( $content ) ) {
+                               return array( null, $redirects );
+                       }
 
                        // Add the page to the list of updated pages before we 
start trying to update to catch redirect loops.
                        $this->updated[] = $titleText;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91f7ae0d24a6977f05fc316bec5a1dbd49f7e75e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to