FeaturedFeeds: Use SidebarBeforeOutput hook

SkinTemplateOutputPageBeforeExec is deprecated Bug: T255380 Change-Id: Ib4cc9d104bae07fd78ee10c3aa5596734a7924b9
wikimedia · Jun 14, 2020 · 3ee517c · 3ee517c
1 parent a7498a8
commit 3ee517c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 28 deletions.
diff --git a/extension.json b/extension.json
@@ -19,7 +19,7 @@
 	"Hooks": {
 		"PageContentSaveComplete": "FeaturedFeeds::pageContentSaveComplete",
 		"BeforePageDisplay": "FeaturedFeeds::beforePageDisplay",
-		"SkinTemplateOutputPageBeforeExec": "FeaturedFeeds::skinTemplateOutputPageBeforeExec"
+		"SidebarBeforeOutput": "FeaturedFeeds::onSidebarBeforeOutput"
 	},
 	"MessagesDirs": {
 		"FeaturedFeeds": [

diff --git a/includes/FeaturedFeeds.php b/includes/FeaturedFeeds.php
@@ -116,37 +116,42 @@ public static function beforePageDisplay( OutputPage &$out ) {
 	}
 
 	/**
-	 * SkinTemplateOutputPageBeforeExec hook handler
-	 * @param Skin &$sk
-	 * @param QuickTemplate &$tpl
-	 * @return bool
+	 * SidebarBeforeOutput hook handler
+	 *
+	 * @param Skin $skin
+	 * @param array &$sidebar
 	 */
-	public static function skinTemplateOutputPageBeforeExec( &$sk, &$tpl ) {
+	public static function onSidebarBeforeOutput( Skin $skin, &$sidebar ) {
 		global $wgDisplayFeedsInSidebar, $wgAdvertisedFeedTypes;
 
-		if ( ( $wgDisplayFeedsInSidebar
-			|| !wfMessage( 'ffeed-enable-sidebar-links' )->inContentLanguage()->isDisabled()
-			) && $sk->getContext()->getTitle()->isMainPage()
-		) {
-			$feeds = self::getFeeds(
-				$sk->getContext()->getLanguage()->getCode(),
-				$sk->getUser()
-			);
-			$links = [];
-			$format = $wgAdvertisedFeedTypes[0]; // @fixme:
-			/** @var FeaturedFeedChannel $feed */
-			foreach ( $feeds as $feed ) {
-				$links[] = [
-					'href' => $feed->getURL( $format ),
-					'title' => $feed->title,
-					'text' => $feed->shortTitle,
-				];
-			}
-			if ( count( $links ) ) {
-				$tpl->data['sidebar']['ffeed-sidebar-section'] = $links;
-			}
+		if ( !$skin->getTitle()->isMainPage() ) {
+			return;
+		}
+
+		$msgDisabled = $skin->msg( 'ffeed-enable-sidebar-links' )->inContentLanguage()->isDisabled();
+
+		if ( !$wgDisplayFeedsInSidebar || $msgDisabled ) {
+			return;
+		}
+
+		$feeds = self::getFeeds(
+			$skin->getLanguage()->getCode(),
+			$skin->getUser()
+		);
+		$links = [];
+		$format = $wgAdvertisedFeedTypes[0]; // @fixme:
+		/** @var FeaturedFeedChannel $feed */
+		foreach ( $feeds as $feed ) {
+			$links[] = [
+				'href' => $feed->getURL( $format ),
+				'title' => $feed->title,
+				'text' => $feed->shortTitle,
+			];
+		}
+
+		if ( count( $links ) ) {
+			$sidebar['ffeed-sidebar-section'] = $links;
 		}
-		return true;
 	}
 
 	/**