From 3435f8fd9b3cc5a38560ed75a6d8440df4e1cd54 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 27 Aug 2021 08:47:15 -0700
Subject: [PATCH] Template directory is set in skin.json

Thanks to the upstream changes in T262067 we can make this template
directory relative to the skin and declare it inside skin.json

Bug: T262067
Change-Id: Ieccdf87979d14eeec0834b6b0cecf064d5fd9cfc
---
 includes/SkinVector.php | 1 -
 skin.json               | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/SkinVector.php b/includes/SkinVector.php
index b16cda730..668b0fa59 100644
--- a/includes/SkinVector.php
+++ b/includes/SkinVector.php
@@ -89,7 +89,6 @@ class SkinVector extends SkinMustache {
 			unset( $options['link'] );
 		}
 
-		$options['templateDirectory'] = __DIR__ . '/templates';
 		parent::__construct( $options );
 	}
 
diff --git a/skin.json b/skin.json
index d6869a35a..4c787d190 100644
--- a/skin.json
+++ b/skin.json
@@ -24,6 +24,7 @@
 					"scripts": [
 						"skins.vector.js"
 					],
+					"templateDirectory": "includes/templates",
 					"responsive": true,
 					"styles": [
 						"mediawiki.ui.button",