Search patch (#38)

* Bug fixes for search see #39 * Bug fixes for search
Hutchy68 · May 4, 2017 · 3038a4c · 3038a4c
1 parent 755d190
commit 3038a4c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -118,10 +118,10 @@ public function execute() {
       					<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 @@ public function execute() {
 												<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
@@ -1,6 +1,6 @@
 {
 	"name": "Pivot",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"author": [
 		"Tom Hutchison",
 		"..."