Remove VectorAfterToolbox hook

Bug: T258814 Change-Id: I56c7efec0df021b3af3205ba80ea33b8fa470880
wikimedia · Jul 26, 2020 · ea52da4 · ea52da4
1 parent 89114e3
commit ea52da4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/hooks.txt b/hooks.txt
diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
@@ -305,22 +305,13 @@ private function buildSidebar() : array {
 				case 'SEARCH':
 					break;
 				case 'TOOLBOX':
-					$portal = $this->getMenuData(
-						'tb', $content, self::MENU_TYPE_PORTAL
+					$props[] = $this->getMenuData(
+						'tb', $content,  self::MENU_TYPE_PORTAL
 					);
-					// Run deprecated hook.
-					// Use SidebarBeforeOutput instead.
-					ob_start();
-					Hooks::run( 'VectorAfterToolbox', [], '1.35' );
-					$props[] = $portal + [
-						'html-hook-vector-after-toolbox' => ob_get_clean(),
-					];
 					break;
 				case 'LANGUAGES':
 					$portal = $this->getMenuData(
-						'lang',
-						$content,
-						self::MENU_TYPE_PORTAL
+						'lang', $content, self::MENU_TYPE_PORTAL
 					);
 					// The language portal will be added provided either
 					// languages exist or there is a value in html-after-portal

diff --git a/includes/templates/Menu.mustache b/includes/templates/Menu.mustache
@@ -20,5 +20,3 @@
 		{{{html-after-portal}}}
 	</div>
 </nav>
-{{! Note: html-hook-vector-after-toolbox is deprecated. }}
-{{{html-hook-vector-after-toolbox}}}
diff --git a/stories/types.js b/stories/types.js
@@ -59,7 +59,5 @@
  * @property {string} list-classes of the unordered list element inside the menu
  * @property {string} [html-user-language-attributes]
  * @property {boolean} [is-dropdown]
- * @property {string} [html-hook-vector-after-toolbox] Deprecated and used
- *  by the toolbox portal menu.
  * @property {string} [html-after-portal] Additional HTML specific to portal menus.
  */