nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1718787 Multi-server setup breaks Designer

Browse Source
This commit is contained in:
Marc Delisle
2007-05-26 18:31:40 +00:00
parent e447eaa116
commit d97c7c4b21
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -77,6 +77,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Gordon McNaughton thanks to Gordon McNaughton
- bug #1715709 export in SQL format always includes procedures and functions - bug #1715709 export in SQL format always includes procedures and functions
- bug #1722502 DROP TABLE in export view structure - bug #1722502 DROP TABLE in export view structure
- bug #1718787 Multi-server setup breaks Designer
2.10.1.0 (2007-04-23) 2.10.1.0 (2007-04-23)
===================== =====================

8
pmd/scripts/move.js
View File

@@ -448,7 +448,7 @@ function Get_url_pos()
function Save2() 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(); poststr += Get_url_pos();
makeRequest('pmd_save_pos.php', poststr); 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').innerHTML = "";
document.getElementById('hint').style.visibility = "hidden"; document.getElementById('hint').style.visibility = "hidden";
document.getElementById('display_field_button').className = 'M_butt'; 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() function New_relation()
{ {
document.getElementById('layer_new_relation').style.visibility = 'hidden'; 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 += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
link_relation += Get_url_pos(); link_relation += Get_url_pos();
@@ -736,7 +736,7 @@ function Canvas_click(id)
function Upd_relation() function Upd_relation()
{ {
document.getElementById('layer_upd_relation').style.visibility = 'hidden'; 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(); link_relation += Get_url_pos();
makeRequest('pmd_relation_upd.php', link_relation); makeRequest('pmd_relation_upd.php', link_relation);
} }

1
pmd_general.php
View File

@@ -33,6 +33,7 @@ $hidden = "hidden";
// <![CDATA[ // <![CDATA[
<?php <?php
echo ' echo '
var server = "' . PMA_escapeJsString($server) . '";
var db = "' . PMA_escapeJsString($db) . '"; var db = "' . PMA_escapeJsString($db) . '";
var token = "' . PMA_escapeJsString($token) . '"; var token = "' . PMA_escapeJsString($token) . '";
var LangSelectReferencedKey = "' . PMA_escapeJsString($strSelectReferencedKey) . '"; var LangSelectReferencedKey = "' . PMA_escapeJsString($strSelectReferencedKey) . '";