Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185812
Change subject: StateBar: Fixed Fatal when redirect article does not exist
......................................................................
StateBar: Fixed Fatal when redirect article does not exist
* replaced return of boolean when null or Title expected
* really fixed: "If redirect points to none existing article you don't get
redirected, so display StateBar."
Change-Id: I0c61bb86d15ca455575dae1e047cd21a26f282b7
---
M StateBar/StateBar.class.php
1 file changed, 10 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/12/185812/1
diff --git a/StateBar/StateBar.class.php b/StateBar/StateBar.class.php
index 058dc24..57afc04 100644
--- a/StateBar/StateBar.class.php
+++ b/StateBar/StateBar.class.php
@@ -260,17 +260,16 @@
global $wgRequest;
if ( $oTitle->isRedirect() && $wgRequest->getVal( 'redirect' )
!= 'no' ) {
//check again for redirect target
- $oTitle = BsArticleHelper::getInstance( $oTitle
)->getTitleFromRedirectRecurse();
- $this->oRedirectTargetTitle = $oTitle;
- if ( $oTitle->exists() ) {
- return $this->checkContext( $oTitle, true );
- } else {
- /* If redirect points to none existing article
- * you don't get redirected, so display
StateBar.
- *See HW#2014010710000128
- */
- return true;
- }
+ $this->oRedirectTargetTitle =
+ BsArticleHelper::getInstance( $oTitle
)->getTitleFromRedirectRecurse();
+ /* If redirect points to none existing article
+ * you don't get redirected, so display StateBar.
+ * See HW#2014010710000128
+ */
+ if( is_null($this->oRedirectTargetTitle) ||
!$this->oRedirectTargetTitle->exists() )
+ return $oTitle;
+
+ return $this->checkContext(
$this->oRedirectTargetTitle, true );
}
$vNoStatebar = BsArticleHelper::getInstance( $oTitle
)->getPageProp( 'bs_nostatebar' );
--
To view, visit https://gerrit.wikimedia.org/r/185812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c61bb86d15ca455575dae1e047cd21a26f282b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
