Tweichart has submitted this change and it was merged.
Change subject: StateBar: Backportet "Fixed Fatal when redirect article does
not exist"
......................................................................
StateBar: Backportet "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."
* I0c61bb86d15ca455575dae1e047cd21a26f282b7
Change-Id: I1330d50ffe4e4d37ad10dbcf08fe7bff90914da1
---
M StateBar/StateBar.class.php
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Tweichart: Verified; Looks good to me, approved
diff --git a/StateBar/StateBar.class.php b/StateBar/StateBar.class.php
index bf7bbf0..e73cef2 100644
--- a/StateBar/StateBar.class.php
+++ b/StateBar/StateBar.class.php
@@ -258,17 +258,17 @@
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/186343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1330d50ffe4e4d37ad10dbcf08fe7bff90914da1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Tweichart <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
