Kevstoy has submitted this change and it was merged.
Change subject: - Added check if user is logged in prior to showing crumbs -
Added better Title lookup to better integrate with Semantictitle and
Mediawiki DISPLAYTITLE variable - Added check for "empty title"
......................................................................
- Added check if user is logged in prior to showing crumbs
- Added better Title lookup to better integrate with Semantictitle and
Mediawiki DISPLAYTITLE variable
- Added check for "empty title"
Change-Id: If24fbb60a183e22b2bd13c790d2d35e5d8e717f3
---
M JSBreadCrumbs.hooks.php
M JSBreadCrumbs.php
2 files changed, 36 insertions(+), 7 deletions(-)
Approvals:
Kevstoy: Verified; Looks good to me, approved
diff --git a/JSBreadCrumbs.hooks.php b/JSBreadCrumbs.hooks.php
index dcbc36e..2564e01 100644
--- a/JSBreadCrumbs.hooks.php
+++ b/JSBreadCrumbs.hooks.php
@@ -5,9 +5,12 @@
*/
public static function addResources( $out ) {
global $wgExtensionAssetsPath;
+ global $wgUser;
- if ( self::enableBreadCrumbs() ) {
- $out->addModules( 'ext.JSBreadCrumbs' );
+ if ( $wgUser->isAllowed('read') ) {
+ if ( self::enableBreadCrumbs() ) {
+ $out->addModules( 'ext.JSBreadCrumbs' );
+ }
}
return true;
@@ -60,12 +63,11 @@
$outPage->addJsConfigVars('wgJSBreadCrumbsLeadingDescription', wfMessage(
"jsbreadcrumbs-leading-description" )->escaped());
$outPage->addJsConfigVars('wgJSBreadCrumbsShowSiteName', $wgUser->getOption(
"jsbreadcrumbs-showsite" ));
+
global $wgTitle;
- if ( class_exists( "SemanticTitle" ) ) {
- //$variables['wgJSBreadCrumbsPageName'] =
SemanticTitle::getText( $wgTitle );
- $outPage->addJsConfigVars('wgJSBreadCrumbsPageName',
SemanticTitle::getText( $wgTitle ));
+ if ( self::getDisplayTitle($wgTitle, $displayTitle) ) {
+ $outPage->addJsConfigVars('wgJSBreadCrumbsPageName',
$displayTitle );
} else {
- //$variables['wgJSBreadCrumbsPageName'] =
$wgTitle->getPrefixedText();
$outPage->addJsConfigVars('wgJSBreadCrumbsPageName',
$wgTitle->getPrefixedText());
}
@@ -110,6 +112,33 @@
return true;
}
+ public static function getDisplayTitle( Title $title, &$displayTitle ) {
+ $id = $title->getArticleID();
+
+ $dbr = wfGetDB( DB_SLAVE );
+ $result = $dbr->select(
+ 'page_props',
+ array( 'pp_value' ),
+ array(
+ 'pp_page' => $id,
+ 'pp_propname' => 'displaytitle'
+ ),
+ __METHOD__
+ );
+
+ if ( $result->numRows() > 0 ) {
+ $row = $result->fetchRow();
+ $displayTitle = $row['pp_value'];
+
+ if($displayTitle == '') {
+ return false;
+ }
+ return true;
+ }
+
+ return false;
+ }
+
static function enableBreadCrumbs() {
global $wgUser;
diff --git a/JSBreadCrumbs.php b/JSBreadCrumbs.php
index e3525f6..683be7d 100644
--- a/JSBreadCrumbs.php
+++ b/JSBreadCrumbs.php
@@ -36,7 +36,7 @@
'path' => __FILE__,
'name' => 'JSBreadCrumbs',
'author' => 'Ryan Lane',
- 'version' => '0.6.2',
+ 'version' => '0.6.3',
'url' =>
'https://www.mediawiki.org/wiki/Extension:JSBreadCrumbs',
'descriptionmsg' => 'jsbreadcrumbs-desc',
);
--
To view, visit https://gerrit.wikimedia.org/r/246780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If24fbb60a183e22b2bd13c790d2d35e5d8e717f3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/JSBreadCrumbs
Gerrit-Branch: master
Gerrit-Owner: Kevstoy <[email protected]>
Gerrit-Reviewer: Kevstoy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
