Still have to propagate $hash to the left frame...

This commit is contained in:
Garvin Hicking
2003-05-02 20:18:24 +00:00
parent 8b8f0c6d16
commit bcc7d8d9f3
5 changed files with 6 additions and 4 deletions

View File

@@ -26,6 +26,8 @@ $Source$
keep the queryframe. Only if JavaScript is usable, otherwise it's keep the queryframe. Only if JavaScript is usable, otherwise it's
not necessary to keep the 'opener' pointer. not necessary to keep the 'opener' pointer.
* libraries/display_tbl.lib.php3: PHP3 compatibility. * libraries/display_tbl.lib.php3: PHP3 compatibility.
* libraries/common.lib.php3, db_details_common.php3, index.php3,
main.php3: Still have to propagate $hash to the left frame...
2003-04-30 Marc Delisle <lem9@users.sourceforge.net> 2003-04-30 Marc Delisle <lem9@users.sourceforge.net>
* pdf_schema.php3, bug 729517, better comment output, * pdf_schema.php3, bug 729517, better comment output,

View File

@@ -47,7 +47,7 @@ if (!isset($message)) {
?> ?>
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript1.2">
<!-- <!--
window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url($db, '', '&'); ?>'); window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url($db, '', '&'); ?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : md5($cfg['PmaAbsoluteUri'])); ?>);
//--> //-->
</script> </script>
<?php <?php

View File

@@ -82,7 +82,7 @@ $phpmain_hash_js = time();
<?php <?php
} else { } else {
?> ?>
<frame src="left.php3?<?php echo $url_query; ?>&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" /> <frame src="left.php3?<?php echo $url_query; ?>&amp;hash='<?php echo $phpmain_hash; ?>" name="nav" frameborder="0" />
<?php <?php
} }
?> ?>

View File

@@ -1267,7 +1267,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
<!-- <!--
if (typeof(window.parent) != 'undefined' if (typeof(window.parent) != 'undefined'
&& typeof(window.parent.frames['nav']) != 'undefined') { && typeof(window.parent.frames['nav']) != 'undefined') {
window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>'); window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : md5($cfg['PmaAbsoluteUri'])); ?>);
} }
//--> //-->
</script> </script>

View File

@@ -43,7 +43,7 @@ else if (isset($reload) && $reload) {
?> ?>
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript1.2">
<!-- <!--
window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url('', '', '&');?>'); window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url('', '', '&');?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : md5($cfg['PmaAbsoluteUri'])); ?>););
//--> //-->
</script> </script>
<?php <?php