Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329815 )

Change subject: Introduce stricter validation involving Newsletters' content 
models
......................................................................

Introduce stricter validation involving Newsletters' content models

This removes the ability to change the content model of a page outside
the Newsletter namespace to NewsletterContent, which produces a stack
trace in some cases. It also prevents weird inconsistencies and behavior
resulting from changing the content model of a newsletter out of
NewsletterContent.

Bug: T154380
Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
---
M Newsletter.hooks.php
M extension.json
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/15/329815/1

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 742963f..1382244 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -288,4 +288,11 @@
                        }
                        return true;
                }
+       public static function contentModelCanBeUsedOn( $modelId, Title $title, 
&$ok ){
+               if ( $title->inNamespace( NS_NEWSLETTER ) && $modelId != 
'NewsletterContent' ) {
+                       $ok = false;
+               } else if ( $modelId == 'NewsletterContent' ) {
+                       $ok = false;
+               }
+       }
 }
diff --git a/extension.json b/extension.json
index 774c4a5..897eff1 100644
--- a/extension.json
+++ b/extension.json
@@ -155,6 +155,9 @@
                ],
                "TitleMove": [
                        "NewsletterHooks::onTitleMove"
+               ],
+               "ContentModelCanBeUsedOn": [
+                       "NewsletterHooks::contentModelCanBeUsedOn"
                ]
        },
        "namespaces": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery <maprea...@olum.org>

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

Reply via email to