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

Change subject: Follow-up ba3cae5d887: deal with unserialize() returning false
......................................................................


Follow-up ba3cae5d887: deal with unserialize() returning false

Change-Id: I5efdd81aa696ef8f7209980e909cb54c9e3ab9ef
---
M fixT159372.php
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/fixT159372.php b/fixT159372.php
index 4c32d47..5ad3bd0 100644
--- a/fixT159372.php
+++ b/fixT159372.php
@@ -36,7 +36,12 @@
                foreach ( $iterator as $batch ) {
                        foreach ( $batch as $row ) {
                                try {
-                                       $reserialized = serialize( unserialize( 
$row->event_extra ) );
+                                       $unserialized = unserialize( 
$row->event_extra );
+                                       if ( !$unserialized ) {
+                                               $this->output( "Failed to 
unserialize event_id {$row->event_id}\n" );
+                                               continue;
+                                       }
+                                       $reserialized = serialize( 
$unserialized );
                                        $dbw->update(
                                                'echo_event',
                                                [ 'event_extra' => 
$reserialized ],
@@ -44,7 +49,7 @@
                                        );
                                        $processed += $dbw->affectedRows();
                                } catch ( Exception $e ) {
-                                       $this->output( "Failed to reserialize 
event_id {$row->event_id}" );
+                                       $this->output( "Failed to reserialize 
event_id {$row->event_id}\n" );
                                }
                        }
                        $this->output( "Reserialized $processed events.\n" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5efdd81aa696ef8f7209980e909cb54c9e3ab9ef
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Catrope <r...@wikimedia.org>
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