Fixes the bug mentioned in nbdd0121/MW-FlowThread#11

Author: nbdd0121

Hooks.php

@@ -17,19 +17,31 @@ public static function onGetPreferences(\User $user, &$preferences) {
 		return true;
 	}
 
-	public static function onSkinBuildSidebar(\Skin $skin, &$bar) {
-		$relevUser = $skin->getRelevantUser();
-		if ($relevUser) {
-			$bar['sidebar-section-extension'][] =
-			array(
+	public static function onBaseTemplateToolbox(\BaseTemplate &$baseTemplate, array &$toolbox) {
+		if (isset($baseTemplate->data['nav_urls']['viewavatar'])
+			&& $baseTemplate->data['nav_urls']['viewavatar']) {
+			$toolbox['viewavatar'] = $baseTemplate->data['nav_urls']['viewavatar'];
+			$toolbox['viewavatar']['id'] = 't-viewavatar';
+		}
+	}
+
+	public static function onSkinTemplateOutputPageBeforeExec(&$skinTemplate, &$tpl) {
+
+		$user = $skinTemplate->getRelevantUser();
+
+		if ($user) {
+			$nav_urls = $tpl->get('nav_urls');
+
+			$nav_urls['viewavatar'] = [
 				'text' => wfMsg('sidebar-viewavatar'),
 				'href' => \SpecialPage::getTitleFor('ViewAvatar')->getLocalURL(array(
-					'user' => $relevUser->getName(),
+					'user' => $user->getName(),
 				)),
-				'id' => 'n-viewavatar',
-				'active' => '',
-			);
+			];
+
+			$tpl->set('nav_urls', $nav_urls);
 		}
+
 		return true;
 	}
 }

extension.json

@@ -16,7 +16,8 @@
 	},
 	"Hooks": {
 		"GetPreferences": "Avatar\\Hooks::onGetPreferences",
-		"SkinBuildSidebar": "Avatar\\Hooks::onSkinBuildSidebar"
+		"BaseTemplateToolbox": "Avatar\\Hooks::onBaseTemplateToolbox",
+		"SkinTemplateOutputPageBeforeExec": "Avatar\\Hooks::onSkinTemplateOutputPageBeforeExec"
 	},
 	"ResourceModules": {
 		"ext.avatar.upload": {