Merge remote-tracking branch 'origin/master'

2012-12-24 15:10:58 +01:00 · 2012-12-24 15:10:58 +01:00 · b8627092c4
commit b8627092c4
parent 8147de48e0 fe741d8571
1 changed files with 2 additions and 1 deletions
--- a/js/common.js
+++ b/js/common.js
@ -81,8 +81,9 @@ var PMA_commonParams = (function () {
         */
        getUrlQuery: function () {
            return $.sprintf(
-                '?%s&db=%s&table=%s',
+                '?%s&server=%s&db=%s&table=%s',
                this.get('common_query'),
+                encodeURIComponent(this.get('server')),
                encodeURIComponent(this.get('db')),
                encodeURIComponent(this.get('table'))
            );