From 3038a4cbe586ceb3871caec5779089693b8cb987 Mon Sep 17 00:00:00 2001
From: Tom Hutchison <Hutchy68@gmail.com>
Date: Thu, 4 May 2017 05:13:54 -0400
Subject: [PATCH] Search patch (#38)

* Bug fixes for search see #39

* Bug fixes for search
---
 CHANGELOG.md   | 5 +++++
 Pivot.skin.php | 8 ++++----
 skin.json      | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27a7961..797b683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Version 1.0.5
+
+* [bug fix] Search link was not follow $wgScript path
+* [language] Search input box localisation
+
 ## Version 1.0.4
 
 * [bug fix] Don't style sitenotice and user message
diff --git a/Pivot.skin.php b/Pivot.skin.php
index 8f839a2..07bf802 100644
--- a/Pivot.skin.php
+++ b/Pivot.skin.php
@@ -118,10 +118,10 @@ class pivotTemplate extends BaseTemplate {
       					<ul class="off-canvas-list">
 						
 								<li class="has-form">
-									<form action="/w/index.php" id="searchform-offcanvas" class="mw-search">
+									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
 										<div class="row collapse">
 											<div class="small-12 columns">
-												<input type="search" name="search" placeholder="Search" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
+												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
 											</div>
 										</div>
 									</form>
@@ -163,10 +163,10 @@ class pivotTemplate extends BaseTemplate {
 												<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height: auto;display: inline-block; vertical-align: middle;"></a>		
 											</li>
 											<li class="has-form">
-												<form action="/w/index.php" id="searchform" class="mw-search">
+												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
 													<div class="row collapse">
 														<div class="small-12 columns">
-															<input type="search" name="search" placeholder="Search" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
+															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
 														</div>
 													</div>
 												</form>
diff --git a/skin.json b/skin.json
index 77c7926..e47ef7a 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
 	"name": "Pivot",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"author": [
 		"Tom Hutchison",
 		"..."