webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_3_5'

Browse Source 
Conflicts:
	ChangeLog
	tbl_gis_visualization.php
This commit is contained in:
Dieter Adriaenssens
2013-04-01 22:50:40 +02:00
parent 58a8e37de4 7e9ac67cbb
commit d83d4eb683
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -106,7 +106,8 @@ underscore
- bug #3828 MariaDB reported as MySQL
- bug #3854 Incorrect header for Safari 6.0
- bug #3705 Attempt to open trigger for edit gives NULL
- Use HTML5 DOCTYPE
- Use HTML5 DOCTYPE
- [security] Self-XSS on GIS visualisation page, reported by Janek Vind
3.5.7.0 (2013-02-15)
- bug #3779 [core] Problem with backslash in enum fields

2
tbl_gis_visualization.php
View File

@@ -196,7 +196,7 @@ if ($svg_support) {
<div style="clear:both;">&nbsp;</div>
<div id="placeholder" style="width:<?php echo($visualizationSettings['width']); ?>px;height:<?php echo($visualizationSettings['height']); ?>px;">
<div id="placeholder" style="width:<?php echo htmlspecialchars($visualizationSettings['width']); ?>px;height:<?php echo htmlspecialchars($visualizationSettings['height']); ?>px;">
<?php echo $visualization; ?>
</div>
<div id="openlayersmap"></div>