diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | pmd/scripts/move.js | 8 | ||||
| -rw-r--r-- | pmd_general.php | 1 |
3 files changed, 6 insertions, 4 deletions
@@ -77,6 +77,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Gordon McNaughton - bug #1715709 export in SQL format always includes procedures and functions - bug #1722502 DROP TABLE in export view structure +- bug #1718787 Multi-server setup breaks Designer 2.10.1.0 (2007-04-23) ===================== diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js index 96eba4ce9c..7a03e5d085 100644 --- a/pmd/scripts/move.js +++ b/pmd/scripts/move.js @@ -448,7 +448,7 @@ function Get_url_pos() function Save2() { - var poststr = 'IS_AJAX=1&db=' + db + '&token=' + token + '&die_save_pos=1'; + var poststr = 'IS_AJAX=1&server='+server+'&db=' + db + '&token=' + token + '&die_save_pos=1'; poststr += Get_url_pos(); makeRequest('pmd_save_pos.php', poststr); } @@ -549,14 +549,14 @@ function Click_field(T, f, PK) // table field document.getElementById('hint').innerHTML = ""; document.getElementById('hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; - makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&db=' + db + '&token=' + token); + makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } } function New_relation() { document.getElementById('layer_new_relation').style.visibility = 'hidden'; - link_relation += '&db=' + db + '&token=' + token + '&die_save_pos=0'; + link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value; link_relation += Get_url_pos(); @@ -736,7 +736,7 @@ function Canvas_click(id) function Upd_relation() { document.getElementById('layer_upd_relation').style.visibility = 'hidden'; - link_relation += '&db=' + db + '&token=' + token + '&die_save_pos=0'; + link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += Get_url_pos(); makeRequest('pmd_relation_upd.php', link_relation); } diff --git a/pmd_general.php b/pmd_general.php index d010a00077..366f5dd9af 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -33,6 +33,7 @@ $hidden = "hidden"; // <![CDATA[ <?php echo ' + var server = "' . PMA_escapeJsString($server) . '"; var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '"; var LangSelectReferencedKey = "' . PMA_escapeJsString($strSelectReferencedKey) . '"; |