gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong merge

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-03-01 08:00:54 +01:00
parent d280e53aaa
commit ed5a8307c7
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
templates/table/search/input_box.phtml
View File

@ -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; ?>