diff --git a/ChangeLog b/ChangeLog index fbf15eea4..bdae7c5aa 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,9 @@ $Id$ $Source$ 2006-07-03 Sebastian Mendel - * libraries/footer.inc.php: bug #1477576 with rtl langs, navi links open in - wrong frame + * index.php, js\querywindow.js, querywindow.php, libraries\common.lib.php, + libraries\footer.inc.php, libraries\sql_query_form.lib.php: + bug #1477576 with rtl langs, navi links open in wrong frame 2006-07-02 Marc Delisle * db_operations.php: undefined $table when copying a db diff --git a/index.php b/index.php index 034c553fb..63e59fad7 100644 --- a/index.php +++ b/index.php @@ -128,6 +128,13 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); var db = ''; var text_dir = ''; var pma_absolute_uri = ''; + + var frame_content = window.frames[1]; + var frame_navigation = window.frames[0]; + + var frame_content = window.frames[0]; + var frame_navigation = window.frames[1]; + // ]]> diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 41ae52336..daf181339 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -104,9 +104,9 @@ function PMA_sqlQueryForm($query = true, $display_tab = false) ?>
name="sqlform" - onsubmit="var save_name = window.opener.parent.frames[1].name; - window.opener.parent.frames[1].name = save_name + ''; - this.target = window.opener.parent.frames[1].name; + onsubmit="var save_name = window.opener.parent.frame_content.name; + window.opener.parent.frame_content.name = save_name + ''; + this.target = window.opener.parent.frame_content.name; return checkSqlQuery( this );" > ' . htmlspecialchars($db) . ''; @@ -248,7 +248,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false) . '?' . PMA_generate_common_url($db) . '"'; if ($is_querywindow) { $strDBLink .= ' target="_self"' - . ' onclick="this.target=window.opener.frames[1].name"'; + . ' onclick="this.target=window.opener.frame_content.name"'; } $strDBLink .= '>' . htmlspecialchars($db) . ''; diff --git a/querywindow.php b/querywindow.php index ce61c26e1..02695b986 100644 --- a/querywindow.php +++ b/querywindow.php @@ -56,7 +56,7 @@ require_once('./libraries/header_meta_style.inc.php');