jenkins-bot has submitted this change and it was merged.
Change subject: Simplify and streamline Wikibase.hooks implementations
......................................................................
Simplify and streamline Wikibase.hooks implementations
This is a follow up to I3d8b12d.
Rename $entityNamespaceLookup to $namespaceLookup
Change " quotes to ' where possible
Change-Id: I0c55546cc30ac60e6dc3fd26f0d431842044e352
---
M repo/Wikibase.hooks.php
1 file changed, 15 insertions(+), 15 deletions(-)
Approvals:
Ricordisamoa: Looks good to me, but someone else must approve
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index e6d409b..1623431 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -192,9 +192,9 @@
* @return bool
*/
public static function onNamespaceIsMovable( $ns, &$movable ) {
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
- if ( $entityNamespaceLookup->isEntityNamespace( $ns ) ) {
+ if ( $namespaceLookup->isEntityNamespace( $ns ) ) {
$movable = false;
}
@@ -466,7 +466,7 @@
)
);
- $s .= " " . $history->msg( 'parentheses' )->rawParams(
$link )->escaped();
+ $s .= ' ' . $history->msg( 'parentheses' )->rawParams(
$link )->escaped();
}
return true;
@@ -698,9 +698,9 @@
*/
public static function onShowSearchHitTitle( &$link_t, &$titleSnippet,
SearchResult $result ) {
$title = $result->getTitle();
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
- if ( $entityNamespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
+ if ( $namespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
$titleSnippet = $title->getPrefixedText();
}
@@ -723,9 +723,9 @@
* @return bool
*/
public static function onTitleGetRestrictionTypes( Title $title, array
&$types ) {
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
- if ( $entityNamespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
+ if ( $namespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
// Remove create and move protection for Wikibase
namespaces
$types = array_diff( $types, array( 'create', 'move' )
);
}
@@ -874,9 +874,9 @@
* @return bool
*/
public static function onOutputPageBeforeHtmlRegisterConfig( OutputPage
$out, &$html ) {
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
- if ( !$entityNamespaceLookup->isEntityNamespace(
$out->getTitle()->getNamespace() ) ) {
+ if ( !$namespaceLookup->isEntityNamespace(
$out->getTitle()->getNamespace() ) ) {
return true;
}
@@ -901,11 +901,11 @@
* @return bool
*/
public static function onContentModelCanBeUsedOn( $contentModel, Title
$title, &$ok ) {
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
$expectedModel = array_search(
$title->getNamespace(),
- $entityNamespaceLookup->getEntityNamespaces()
+ $namespaceLookup->getEntityNamespaces()
);
// If the namespace is an entity namespace, the content model
@@ -1038,9 +1038,9 @@
array &$navigationUrls
) {
$title = $skinTemplate->getTitle();
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
- if ( !$entityNamespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
+ if ( !$namespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
return true;
}
@@ -1084,10 +1084,10 @@
*/
public static function onSkinMinervaDefaultModules( Skin $skin, array
&$modules ) {
$title = $skin->getTitle();
- $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
// remove the editor module so that it does not get loaded on
entity pages
- if ( $entityNamespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
+ if ( $namespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
unset( $modules['editor'] );
}
--
To view, visit https://gerrit.wikimedia.org/r/233913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c55546cc30ac60e6dc3fd26f0d431842044e352
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: Ricordisamoa <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
