From 9f1e4b117fb0133c44fd588894a7c071ed6330b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Tue, 22 Jul 2014 20:27:46 +0200
Subject: [PATCH] Move Vector's $wg configuration options to Vector.php

Change-Id: Ic1801bff707ebfb3fccdbf4ac257ed6593ca3178
---
 includes/DefaultSettings.php | 14 --------------
 skins/Vector/Vector.php      | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 48e7d9800d..cbcf456c21 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3117,20 +3117,6 @@ $wgFooterIcons = array(
  */
 $wgUseCombinedLoginLink = false;
 
-/**
- * Search form look for Vector skin only.
- *  - true = use an icon search button
- *  - false = use Go & Search buttons
- */
-$wgVectorUseSimpleSearch = true;
-
-/**
- * Watch and unwatch as an icon rather than a link for Vector skin only.
- *  - true = use an icon watch/unwatch button
- *  - false = use watch/unwatch text link
- */
-$wgVectorUseIconWatch = true;
-
 /**
  * Display user edit counts in various prominent places.
  */
diff --git a/skins/Vector/Vector.php b/skins/Vector/Vector.php
index a08d121d05..d16e8bbf1b 100644
--- a/skins/Vector/Vector.php
+++ b/skins/Vector/Vector.php
@@ -86,3 +86,19 @@ $wgResourceModuleSkinStyles['vector'] = array(
 	'remoteSkinPath' => 'Vector',
 	'localBasePath' => __DIR__,
 );
+
+// Configuration options
+
+/**
+ * Search form look.
+ *  - true = use an icon search button
+ *  - false = use Go & Search buttons
+ */
+$wgVectorUseSimpleSearch = true;
+
+/**
+ * Watch and unwatch as an icon rather than a link.
+ *  - true = use an icon watch/unwatch button
+ *  - false = use watch/unwatch text link
+ */
+$wgVectorUseIconWatch = true;
-- 
2.20.1