jenkins-bot has submitted this change and it was merged.
Change subject: Fix SecurePollContent handling
......................................................................
Fix SecurePollContent handling
It was accidentally creating an instance of the parent class,
JsonContent, instead.
Change-Id: I5a0f7eaad1143b39c9045337d88cdfeb1bcb8f82
(cherry picked from commit 176992c8d129aa8ddc1d715b4099e7ea909bf864)
---
M includes/main/SecurePollContent.php
M includes/main/SecurePollContentHandler.php
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/main/SecurePollContent.php
b/includes/main/SecurePollContent.php
index c0c7445..b02ead3 100644
--- a/includes/main/SecurePollContent.php
+++ b/includes/main/SecurePollContent.php
@@ -10,4 +10,7 @@
*/
class SecurePollContent extends JsonContent {
+ public function __construct( $text, $modelId = 'SecurePoll' ) {
+ parent::__construct( $text, $modelId );
+ }
}
diff --git a/includes/main/SecurePollContentHandler.php
b/includes/main/SecurePollContentHandler.php
index 12a6b15..236ecfb 100644
--- a/includes/main/SecurePollContentHandler.php
+++ b/includes/main/SecurePollContentHandler.php
@@ -176,4 +176,8 @@
'unprotect' => false,
);
}
+
+ protected function getContentClass() {
+ return 'SecurePollContent';
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/174125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a0f7eaad1143b39c9045337d88cdfeb1bcb8f82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
