From ed5a8307c7629e04bff0b89595cd98228e2e7d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 1 Mar 2016 08:00:54 +0100
Subject: [PATCH] Fix wrong merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 templates/table/search/input_box.phtml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/templates/table/search/input_box.phtml b/templates/table/search/input_box.phtml
index 4446865616..9898135b03 100644
--- a/templates/table/search/input_box.phtml
+++ b/templates/table/search/input_box.phtml
@@ -90,23 +90,13 @@ if ($_foreigners
                 && is_array($criteriaValues[$column_index])
                 && in_array($value[$j], $criteriaValues[$column_index])
             ): ?>
-<<<<<<< HEAD
-                <option value="<?= $value[$j]; ?>"
-                        selected>
-                    <?= $value[$j]; ?>
-                </option>
-            <?php else: ?>
-                <option value="<?= $value[$j]; ?>">
-                    <?= $value[$j]; ?>
-=======
-                <option value="<?php echo htmlspecialchars($value[$j]); ?>"
+                <option value="<?= htmlspecialchars($value[$j]); ?>"
                         selected>
                     <?php echo htmlspecialchars($value[$j]); ?>
                 </option>
             <?php else: ?>
-                <option value="<?php echo htmlspecialchars($value[$j]); ?>">
+                <option value="<?= htmlspecialchars($value[$j]); ?>">
                     <?php echo htmlspecialchars($value[$j]); ?>
->>>>>>> MAINT_4_5_5-security
                 </option>
             <?php endif; ?>
         <?php endfor; ?>
@@ -136,11 +126,7 @@ if ($_foreigners
            <?php if (isset($criteriaValues[$column_index])
                && is_string($criteriaValues[$column_index])
            ): ?>
-<<<<<<< HEAD
-               value="<?= $criteriaValues[$column_index]; ?>"
-=======
-               value="<?php echo htmlspecialchars($criteriaValues[$column_index]); ?>"
->>>>>>> MAINT_4_5_5-security
+               value="<?= htmlspecialchars($criteriaValues[$column_index]); ?>"
            <?php endif; ?>/>
 
 <?php endif; ?>