Resolved conflict

box · Sep 16, 2016 · 46d1e82 · 46d1e82
2 parents bd1ab84 + eb36124
commit 46d1e82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/views/samples.php b/views/samples.php
@@ -27,7 +27,7 @@
 <div class="row">
 	<div class="span12">
                 <i class="icon-leaf"></i> <strong>Sample</strong> on db <strong> <?php echo $sample['db_max']; ?> </strong> @ host <strong><?php echo $sample['hostname_max']; ?></strong> at <strong><?php echo $sample['ts_max']; ?></strong>
-		<pre class="prettyprint lang-sql"><?php echo $sample['sample']; ?></pre>
+		<pre class="prettyprint lang-sql"><?php echo htmlspecialchars($sample['sample']); ?></pre>
 	</div>
 </div>
 <?php } ?>

diff --git a/views/show_query.php b/views/show_query.php
@@ -258,7 +258,7 @@ function showTooltip(x, y, contents) {
 					</td>
 				</tr>
 				</table>
-				<pre class="prettyprint lang-sql"><?php echo $sample[$sample_field_name]; ?></pre>
+				<pre class="prettyprint lang-sql"><?php echo htmlspecialchars($sample[$sample_field_name]); ?></pre>
 				<?php } ?>
 
 		<?php if (isset($explain_plan_error)) { ?>