Merge remote-tracking branch 'origin/master'

phpmyadmin · Jun 15, 2017 · 38c6c42 · 38c6c42
2 parents 7d0ca5f + a270570
commit 38c6c42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 - issue #6363  phpMyAdmin no longer requires eval() in PHP
 - issue #12386 The mbstring dependency is now optional
 - issue #13269 Small refactoring in preparation to CSP
+- issue #13384 Database link broken in Databases Page
 
 4.7.2 (not yet released)
 - issue #13314 Make theme selection keep current server

diff --git a/templates/server/databases/table_row.phtml b/templates/server/databases/table_row.phtml
@@ -11,7 +11,7 @@
         </td>
     <?php endif; ?>
     <td class="name">
-        <a href="<?= \PMA\libraries\Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database') , $url_query , '&amp;db=' , urlencode($current['SCHEMA_NAME']); ?>"
+        <a href="<?= \PMA\libraries\Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database') , $url_query , \PMA\libraries\URL::getCommon(array('db' => $current['SCHEMA_NAME'])); ?>"
            title="<?= sprintf(__('Jump to database'), htmlspecialchars($current['SCHEMA_NAME'])); ?>">
             <?= htmlspecialchars($current['SCHEMA_NAME']); ?>
         </a>