From ef70c1523fcbd1feafc7079938fe7e1f9c7ed2bf Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Wed, 27 Nov 2013 17:42:26 +0100
Subject: [PATCH] HTML validation

---
 src/CustomMarkdown.php       | 2 +-
 src/Views/tag-mass-tag.phtml | 4 ++--
 src/Views/tag-merge.phtml    | 2 +-
 src/Views/tag-rename.phtml   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CustomMarkdown.php b/src/CustomMarkdown.php
index 9e8bc817..11e76253 100644
--- a/src/CustomMarkdown.php
+++ b/src/CustomMarkdown.php
@@ -126,7 +126,7 @@ class CustomMarkdown extends \Michelf\Markdown
 		$link = \Chibi\UrlHelper::route('post', 'list', ['query' => '_query_']);
 		return preg_replace_callback('{\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]}is', function($x) use ($link)
 		{
-			return $this->hashPart('<a href="' . str_replace('_query_', $x[1], $link) . '">' . $x[1] . '</a>');
+			return $this->hashPart('<a href="' . str_replace('_query_', urlencode($x[1]), $link) . '">' . $x[1] . '</a>');
 		}, $text);
 	}
 }
diff --git a/src/Views/tag-mass-tag.phtml b/src/Views/tag-mass-tag.phtml
index fb3ec0c0..13955a49 100644
--- a/src/Views/tag-mass-tag.phtml
+++ b/src/Views/tag-mass-tag.phtml
@@ -3,12 +3,12 @@
 		<h1>mass tag</h1>
 		<div>
 			<label class="left" for="mass-tag-query">Search query:</label>
-			<div class="input-wrapper"><input class="autocomplete" type="text" type="text" name="query" id="mass-tag-query" value="<?php echo isset($this->context->massTagQuery) ? $this->context->massTagQuery : '' ?>" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
+			<div class="input-wrapper"><input class="autocomplete" type="text" name="query" id="mass-tag-query" value="<?php echo isset($this->context->massTagQuery) ? $this->context->massTagQuery : '' ?>" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
 		</div>
 
 		<div>
 			<label class="left" for="mass-tag-tag">Tag:</label>
-			<div class="input-wrapper"><input class="autocomplete" type="text" type="text" name="tag" id="mass-tag-tag" value="<?php echo isset($this->context->massTagTag) ? $this->context->massTagTag : '' ?>" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
+			<div class="input-wrapper"><input class="autocomplete" type="text" name="tag" id="mass-tag-tag" value="<?php echo isset($this->context->massTagTag) ? $this->context->massTagTag : '' ?>" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
 		</div>
 
 		<input type="hidden" name="submit" value="1"/>
diff --git a/src/Views/tag-merge.phtml b/src/Views/tag-merge.phtml
index 93dc351d..31c4bde5 100644
--- a/src/Views/tag-merge.phtml
+++ b/src/Views/tag-merge.phtml
@@ -3,7 +3,7 @@
 		<h1>merge tags</h1>
 		<div>
 			<label class="left" for="merge-source-tag">Source tag:</label>
-			<div class="input-wrapper"><input class="autocomplete" type="text" type="text" name="source-tag" id="merge-source-tag" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
+			<div class="input-wrapper"><input class="autocomplete" type="text" name="source-tag" id="merge-source-tag" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
 		</div>
 
 		<div>
diff --git a/src/Views/tag-rename.phtml b/src/Views/tag-rename.phtml
index 42cfc79c..7ce2ae20 100644
--- a/src/Views/tag-rename.phtml
+++ b/src/Views/tag-rename.phtml
@@ -3,7 +3,7 @@
 		<h1>rename tags</h1>
 		<div>
 			<label class="left" for="rename-source-tag">Source tag:</label>
-			<div class="input-wrapper"><input class="autocomplete" type="text" type="text" name="source-tag" id="rename-source-tag" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
+			<div class="input-wrapper"><input class="autocomplete" type="text" name="source-tag" id="rename-source-tag" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/></div>
 		</div>
 
 		<div>