Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221305
Change subject: Temporarily make subpages in occupied namespaces non-Flow again
......................................................................
Temporarily make subpages in occupied namespaces non-Flow again
This will allow ContentHandler::getDefaultModelFor to do the right
thing for wikitext subpages last edited before $wgContentHandlerUseDB
was turned on.
This should go to production. Then, Kunal's script for T103388
should be run on all WMF wikis. Then, this can be reverted.
Bug: T103776
Change-Id: I7af2e61dbb4968977c0898d20de24f8ce5f59f12
(cherry picked from commit 1f99880d9e1be0937578f4b240010641a3b88820)
---
M includes/TalkpageManager.php
M tests/phpunit/TalkpageManagerTest.php
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/05/221305/1
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index 7a93e5c..d399024 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -106,7 +106,7 @@
if ( in_array( $title->getPrefixedText(),
$this->occupiedPages ) ) {
return true;
}
- if ( in_array( $title->getNamespace(),
$this->occupiedNamespaces ) ) {
+ if ( !$title->isSubpage() && in_array(
$title->getNamespace(), $this->occupiedNamespaces ) ) {
return true;
}
}
diff --git a/tests/phpunit/TalkpageManagerTest.php
b/tests/phpunit/TalkpageManagerTest.php
index 61b6817..c8c3bf9 100644
--- a/tests/phpunit/TalkpageManagerTest.php
+++ b/tests/phpunit/TalkpageManagerTest.php
@@ -48,6 +48,9 @@
false,
true
),
+ /*
+ Temporarily disabled for T103776
+
array(
array(),
array( NS_USER_TALK ),
@@ -55,6 +58,7 @@
false,
true
),
+ */
array(
array(),
array( NS_USER_TALK ),
--
To view, visit https://gerrit.wikimedia.org/r/221305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7af2e61dbb4968977c0898d20de24f8ce5f59f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
