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

patch #2099962 [js] fix js error without frameset

Browse Source
This commit is contained in:
Marc Delisle
2008-09-09 17:05:58 +00:00
parent 023c4442e0
commit 8a4d1084d3
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

@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- patch #2089240 [export] handle correctly switching SQL modes - patch #2089240 [export] handle correctly switching SQL modes
+ rfe #1612724 [export] add option to export without comments + rfe #1612724 [export] add option to export without comments
- bug #2090002 [display] Cannot edit row in VIEW - bug #2090002 [display] Cannot edit row in VIEW
- patch #2099962 [js] fix js error without frameset, thanks to Xuefer
3.0.0.0 (not yet released) 3.0.0.0 (not yet released)
+ [export] properly handle line breaks for YAML, thanks to Dan Barry - + [export] properly handle line breaks for YAML, thanks to Dan Barry -

5
libraries/common.lib.php
View File

@@ -955,7 +955,8 @@ function PMA_reloadNavigation()
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
if (typeof(window.parent) != 'undefined' if (typeof(window.parent) != 'undefined'
&& typeof(window.parent.frame_navigation) != 'undefined') { && typeof(window.parent.frame_navigation) != 'undefined'
&& window.parent.goTo) {
window.parent.goTo('<?php echo $reload_url; ?>'); window.parent.goTo('<?php echo $reload_url; ?>');
} }
//]]> //]]>
@@ -1000,7 +1001,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
echo "\n"; echo "\n";
echo '<script type="text/javascript">' . "\n"; echo '<script type="text/javascript">' . "\n";
echo '//<![CDATA[' . "\n"; echo '//<![CDATA[' . "\n";
echo "window.parent.updateTableTitle('" . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n"; echo "if (window.parent.updateTableTitle) window.parent.updateTableTitle('" . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n";
echo '//]]>' . "\n"; echo '//]]>' . "\n";
echo '</script>' . "\n"; echo '</script>' . "\n";
} // end if ... elseif } // end if ... elseif

4
server_databases.php
View File

@@ -211,7 +211,7 @@ if ($databases_count > 0) {
} }
echo ' <td class="name">' . "\n" echo ' <td class="name">' . "\n"
. ' <a onclick="' . ' <a onclick="'
. 'if (window.parent.openDb(\'' . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;' . 'if (window.parent.openDb && window.parent.openDb(\'' . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;'
. '" href="index.php?' . $url_query . '&amp;db=' . '" href="index.php?' . $url_query . '&amp;db='
. urlencode($current['SCHEMA_NAME']) . '" title="' . urlencode($current['SCHEMA_NAME']) . '" title="'
. sprintf($strJumpToDB, htmlspecialchars($current['SCHEMA_NAME'])) . sprintf($strJumpToDB, htmlspecialchars($current['SCHEMA_NAME']))
@@ -251,7 +251,7 @@ if ($databases_count > 0) {
echo ' <td class="tool">' . "\n" echo ' <td class="tool">' . "\n"
. ' <a onclick=" . ' <a onclick="
// <![CDATA[ // <![CDATA[
window.parent.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\'); if (window.parent.setDb) window.parent.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\');
// ]]>" href="./server_privileges.php?' . $url_query // ]]>" href="./server_privileges.php?' . $url_query
. '&amp;checkprivs=' . urlencode($current['SCHEMA_NAME']) . '&amp;checkprivs=' . urlencode($current['SCHEMA_NAME'])
. '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['SCHEMA_NAME'])) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['SCHEMA_NAME']))