jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/356523 )

Change subject: Use MediaWiki\suppressWarnings to suppress warnings
......................................................................


Use MediaWiki\suppressWarnings to suppress warnings

Silencing errors is discouraged

Change-Id: Idb02e9936a64d0c2c1d8a02e52df21c59fdad096
---
M maintenance/repair_missing_revision_content.php
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/repair_missing_revision_content.php 
b/maintenance/repair_missing_revision_content.php
index 8af19d5..b243415 100644
--- a/maintenance/repair_missing_revision_content.php
+++ b/maintenance/repair_missing_revision_content.php
@@ -125,11 +125,16 @@
                                foreach ( $range as $possible ) {
                                        $url = "DB://$cluster/$possible";
                                        $content = gzinflate( 
ExternalStore::fetchFromURL( $url ) );
-                                       if ( false !== @unserialize( $content ) 
) {
+                                       MediaWiki\suppressWarnings();
+                                       $unserializedContent = unserialize( 
$content );
+                                       MediaWiki\restoreWarnings();
+                                       if ( false !== $unserializedContent ) {
                                                // if it unserializes, its not 
our content
                                                continue;
                                        }
-                                       $json = @json_decode( $content, true );
+                                       MediaWiki\suppressWarnings();
+                                       $json = json_decode( $content, true );
+                                       MediaWiki\restoreWarnings();
                                        if ( $json && count( $json ) === 1 && 
isset( $json['flow-workflow'] ) ) {
                                                // while technically possible 
to be a topic title, i'm almost
                                                // certain this is a core 
revisions inserted by flow in the form

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb02e9936a64d0c2c1d8a02e52df21c59fdad096
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to