[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15870-g270960e

[Michal Čihař]

The branch, master has been updated
       via  270960ee35349a40315b4abe5512ebaea1967580 (commit)
       via  f6fd4323381cb0e8c041e8d7f1b3cfc13302bb19 (commit)
       via  68da79da00140730542d6c58e074d31363e3c6aa (commit)
       via  599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a (commit)
       via  9d011bbbcd20d6beb7b9b0a3002d132565a5e498 (commit)
       via  e7d6cab2a25e5014c1c10ce927413481dc9ab074 (commit)
      from  1dba9c1836bf12aab40aeb129fd00aa04904a330 (commit)


- Log -----------------------------------------------------------------
commit 270960ee35349a40315b4abe5512ebaea1967580
Merge: f6fd432 1dba9c1
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Aug 19 12:02:31 2011 +0200

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit f6fd4323381cb0e8c041e8d7f1b3cfc13302bb19
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Aug 19 11:57:44 2011 +0200

    Use PMA_DBI_get_tables instead of own query

commit 68da79da00140730542d6c58e074d31363e3c6aa
Merge: 9d011bb 599c9b5
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Aug 19 11:56:43 2011 +0200

    Merge branch 'QA_3_4'

commit 9d011bbbcd20d6beb7b9b0a3002d132565a5e498
Merge: cb9f7a2 e7d6cab
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Aug 19 11:54:47 2011 +0200

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 db_datadict.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/db_datadict.php b/db_datadict.php
index acfb531..e9a8c55 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -55,16 +55,16 @@ if ($cfgRelation['commwork']) {
  * Selects the database and gets tables names
  */
 PMA_DBI_select_db($db);
-$rowset = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
+$tables = PMA_DBI_get_tables($db);
 
 $count  = 0;
-while ($row = PMA_DBI_fetch_row($rowset)) {
+foreach($tables as $row) {
     $table = $row[0];
     $comments = PMA_getComments($db, $table);
 
     echo '<div>' . "\n";
 
-    echo '<h2>' . $table . '</h2>' . "\n";
+    echo '<h2>' . htmlspecialchars($table) . '</h2>' . "\n";
 
     /**
      * Gets table informations
@@ -226,9 +226,9 @@ while ($row = PMA_DBI_fetch_row($rowset)) {
     <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