jenkins-bot has submitted this change and it was merged. Change subject: Collection: Remove deprecated $wgCollectionHierarchyDelimiter configuration ......................................................................
Collection: Remove deprecated $wgCollectionHierarchyDelimiter configuration The $wgCollectionHierarchyDelimiter workaround was removed from the Collection extension in https://gerrit.wikimedia.org/r/197943 so remove it from the wmf configuration as well. Change-Id: Ifc80a14949e2707c53cb4d6cf1697c2effcc53a1 --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 0 insertions(+), 10 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 0f7ed78..d729104 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1617,11 +1617,6 @@ $wgCollectionPortletForLoggedInUsersOnly = $wmgCollectionPortletForLoggedInUsersOnly; $wgCollectionArticleNamespaces = $wmgCollectionArticleNamespaces; - - if ( $wmgCollectionHierarchyDelimiter ) { - $wgCollectionHierarchyDelimiter = $wmgCollectionHierarchyDelimiter; - } - $wgCollectionPortletFormats = $wmgCollectionPortletFormats; } diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1fd85d3..d3b1d81 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10813,11 +10813,6 @@ '+metawiki' => array( 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215 ), // bug 72493 ), -'wmgCollectionHierarchyDelimiter' => array( - 'default' => false, // false == don't overwrite the extension's default settings - 'wikibooks' => '/', -), - 'wmgCollectionPortletFormats' => array( 'default' => array( 'rdf2latex' ), // The old PDF renderer choked on Indic languages. The -- To view, visit https://gerrit.wikimedia.org/r/200037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc80a14949e2707c53cb4d6cf1697c2effcc53a1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Cscott <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
