Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247639
Change subject: fixed bug for non-existant pages
......................................................................
fixed bug for non-existant pages
Change-Id: Iad9bfd8dd105b562a6062ccac751a6253e985459
---
M SemanticTitle.class.php
M SemanticTitle.php
2 files changed, 39 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTitle
refs/changes/39/247639/1
diff --git a/SemanticTitle.class.php b/SemanticTitle.class.php
index 5f7afe1..cd47e6f 100644
--- a/SemanticTitle.class.php
+++ b/SemanticTitle.class.php
@@ -181,16 +181,24 @@
if ( $title->isTalkPage() ) {
- $pagename =
$title->getSubjectPage()->getPrefixedText();
- $displayTitle = $pagename;
- $found = self::getDisplayTitle(
$title->getSubjectPage(),
- $displayTitle );
+ if ( $title->getSubjectPage()->exists() ) {
+
+ $pagename =
$title->getSubjectPage()->getPrefixedText();
+ $displayTitle = $pagename;
+ $found = self::getDisplayTitle(
$title->getSubjectPage(),
+ $displayTitle );
+
+ }
} else {
- $pagename = $title->getPrefixedText();
- $displayTitle = $pagename;
- $found = self::getDisplayTitle( $title,
$displayTitle );
+ if ( $title->exists() ) {
+
+ $pagename = $title->getPrefixedText();
+ $displayTitle = $pagename;
+ $found = self::getDisplayTitle( $title,
$displayTitle );
+
+ }
}
@@ -241,13 +249,26 @@
if ( $title->isTalkPage() ) {
- self::getDisplayTitle( $title->getSubjectPage(),
$displayTitle );
- $displayTitle = wfMessage(
'semantictitle-talkpagetitle',
- $displayTitle )->plain();
+ if ( $title->getSubjectPage()->exists() ) {
+
+ self::getDisplayTitle(
$title->getSubjectPage(), $displayTitle );
+ if ( is_null( $displayTitle ) ) {
+
+ return true;
+
+ }
+
+ $displayTitle = wfMessage(
'semantictitle-talkpagetitle',
+ $displayTitle )->plain();
+ }
} else {
- self::getSemanticTitle( $title, $displayTitle );
+ if ( $title->exists() ) {
+
+ self::getSemanticTitle( $title, $displayTitle );
+
+ }
}
@@ -257,10 +278,14 @@
}
- $parser->mOutput->setDisplayTitle( $displayTitle );
+ $parser->mOutput->setTitleText( $displayTitle );
+ if ( $title->exists() ) {
- self::setDisplayTitle( $title, $displayTitle );
+ $parser->mOutput->setProperty( 'displaytitle',
$displayTitle );
+ self::setDisplayTitle( $title, $displayTitle );
+
+ }
return true;
diff --git a/SemanticTitle.php b/SemanticTitle.php
index 98b262a..a579e70 100644
--- a/SemanticTitle.php
+++ b/SemanticTitle.php
@@ -29,7 +29,7 @@
$GLOBALS['wgExtensionCredits']['semantic'][] = array(
'path' => __FILE__,
'name' => 'Semantic Title',
- 'version' => '3.0',
+ 'version' => '3.1',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]',
'[https://www.mediawiki.org/wiki/User:Van_de_Bugger Van de
Bugger]'
--
To view, visit https://gerrit.wikimedia.org/r/247639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9bfd8dd105b562a6062ccac751a6253e985459
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Cicalese <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
