The branch, master has been updated
via 282e730985a24e5b03b5b8195ef93ac98aee7274 (commit)
via da6e51d00780dd941f4b496c69ae15d0d09bd3a3 (commit)
via 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b (commit)
from 54f96664a486164d23a7bc48efb2a504190c812e (commit)
- Log -----------------------------------------------------------------
commit 282e730985a24e5b03b5b8195ef93ac98aee7274
Merge: 54f9666 da6e51d
Author: Michal Čihař <[email protected]>
Date: Fri Aug 19 12:08:14 2011 +0200
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
db_datadict.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/db_datadict.php b/db_datadict.php
index 10cd8a9..fca38b7 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -203,7 +203,7 @@ foreach($tables as $table) {
} else {
$row['Default'] = htmlspecialchars($row['Default']);
}
- $field_name = htmlspecialchars($row['Field']);
+ $field_name = $row['Field'];
if (PMA_MYSQL_INT_VERSION < 50025
&& !
empty($analyzed_sql[0]['create_table_fields'][$field_name]['type'])
@@ -225,9 +225,9 @@ foreach($tables as $table) {
<td nowrap="nowrap">
<?php
if (isset($pk_array[$row['Field']])) {
- echo '<u>' . $field_name . '</u>';
+ echo '<u>' . htmlspecialchars($field_name) . '</u>';
} else {
- echo $field_name;
+ echo htmlspecialchars($field_name);
}
?>
</td>
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
