Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78028
Change subject: Store the targets list as a serialized string due to bug 52605
......................................................................
Store the targets list as a serialized string due to bug 52605
Change-Id: I69d48048fe6c5be570472be28774f2a88dd6c9f8
---
M MassMessage.body.php
M MassMessage.hooks.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/28/78028/1
diff --git a/MassMessage.body.php b/MassMessage.body.php
index 2c564b8..1dcb8f0 100644
--- a/MassMessage.body.php
+++ b/MassMessage.body.php
@@ -179,7 +179,7 @@
// Parse
$output = $parser->parse( $text, $spamlist, $parserOptions );
- $data = $output->getProperty( 'massmessage-targets' );
+ $data = unserialize( $output->getProperty(
'massmessage-targets' ) );
if ( $data ) {
return $data;
diff --git a/MassMessage.hooks.php b/MassMessage.hooks.php
index 122a551..c09092a 100644
--- a/MassMessage.hooks.php
+++ b/MassMessage.hooks.php
@@ -41,9 +41,9 @@
// Store the data in case we're parsing it manually
if ( defined( 'MASSMESSAGE_PARSE' ) ) {
if ( !$output->getProperty( 'massmessage-targets' ) ) {
- $output->setProperty( 'massmessage-targets',
array( $data ) );
+ $output->setProperty( 'massmessage-targets',
serialize( array( $data ) ) );
} else {
- $output->setProperty( 'massmessage-targets' ,
array_merge( $output->getProperty( 'massmessage-targets' ), array( $data ) ) );
+ $output->setProperty( 'massmessage-targets' ,
serialize( array_merge( unserialize( $output->getProperty(
'massmessage-targets' ) ), array( $data ) ) ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/78028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69d48048fe6c5be570472be28774f2a88dd6c9f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
