Merge branch 'QA_3_3'
Conflicts: libraries/common.lib.php libraries/core.lib.php
This commit is contained in:
Michal Čihař
@@ -117,6 +117,7 @@ $Id$
|
|||||||
- bug [doc] Withdraw or edit FAQ entries related to older MySQL or PHP
|
- bug [doc] Withdraw or edit FAQ entries related to older MySQL or PHP
|
||||||
- bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop
|
- bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop
|
||||||
- bug #3044189 [doc] Cleared documentation for hide_db.
|
- bug #3044189 [doc] Cleared documentation for hide_db.
|
||||||
|
- bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php.
|
||||||
|
|
||||||
3.3.5.0 (2010-07-26)
|
3.3.5.0 (2010-07-26)
|
||||||
- patch #2932113 [information_schema] Slow export when having lots of
|
- patch #2932113 [information_schema] Slow export when having lots of
|
||||||
|
|||||||
@@ -674,77 +674,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
|
|||||||
}
|
}
|
||||||
} // end of the 'PMA_mysqlDie()' function
|
} // end of the 'PMA_mysqlDie()' function
|
||||||
|
|
||||||
/**
|
|
||||||
* Send HTTP header, taking IIS limits into account (600 seems ok)
|
|
||||||
*
|
|
||||||
* @uses PMA_IS_IIS
|
|
||||||
* @uses PMA_COMING_FROM_COOKIE_LOGIN
|
|
||||||
* @uses PMA_get_arg_separator()
|
|
||||||
* @uses SID
|
|
||||||
* @uses strlen()
|
|
||||||
* @uses strpos()
|
|
||||||
* @uses header()
|
|
||||||
* @uses session_write_close()
|
|
||||||
* @uses headers_sent()
|
|
||||||
* @uses function_exists()
|
|
||||||
* @uses debug_print_backtrace()
|
|
||||||
* @uses trigger_error()
|
|
||||||
* @uses defined()
|
|
||||||
* @param string $uri the header to send
|
|
||||||
* @return boolean always true
|
|
||||||
*/
|
|
||||||
function PMA_sendHeaderLocation($uri)
|
|
||||||
{
|
|
||||||
if (PMA_IS_IIS && strlen($uri) > 600) {
|
|
||||||
|
|
||||||
echo '<html><head><title>- - -</title>' . "\n";
|
|
||||||
echo '<meta http-equiv="expires" content="0">' . "\n";
|
|
||||||
echo '<meta http-equiv="Pragma" content="no-cache">' . "\n";
|
|
||||||
echo '<meta http-equiv="Cache-Control" content="no-cache">' . "\n";
|
|
||||||
echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n";
|
|
||||||
echo '<script type="text/javascript">' . "\n";
|
|
||||||
echo '//<![CDATA[' . "\n";
|
|
||||||
echo 'setTimeout("window.location = unescape(\'"' . $uri . '"\')", 2000);' . "\n";
|
|
||||||
echo '//]]>' . "\n";
|
|
||||||
echo '</script>' . "\n";
|
|
||||||
echo '</head>' . "\n";
|
|
||||||
echo '<body>' . "\n";
|
|
||||||
echo '<script type="text/javascript">' . "\n";
|
|
||||||
echo '//<![CDATA[' . "\n";
|
|
||||||
echo 'document.write(\'<p><a href="' . $uri . '">' . __('Go') . '</a></p>\');' . "\n";
|
|
||||||
echo '//]]>' . "\n";
|
|
||||||
echo '</script></body></html>' . "\n";
|
|
||||||
|
|
||||||
} else {
|
|
||||||
if (SID) {
|
|
||||||
if (strpos($uri, '?') === false) {
|
|
||||||
header('Location: ' . $uri . '?' . SID);
|
|
||||||
} else {
|
|
||||||
$separator = PMA_get_arg_separator();
|
|
||||||
header('Location: ' . $uri . $separator . SID);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
session_write_close();
|
|
||||||
if (headers_sent()) {
|
|
||||||
if (function_exists('debug_print_backtrace')) {
|
|
||||||
echo '<pre>';
|
|
||||||
debug_print_backtrace();
|
|
||||||
echo '</pre>';
|
|
||||||
}
|
|
||||||
trigger_error('PMA_sendHeaderLocation called when headers are already sent!', E_USER_ERROR);
|
|
||||||
}
|
|
||||||
// bug #1523784: IE6 does not like 'Refresh: 0', it
|
|
||||||
// results in a blank page
|
|
||||||
// but we need it when coming from the cookie login panel)
|
|
||||||
if (PMA_IS_IIS && defined('PMA_COMING_FROM_COOKIE_LOGIN')) {
|
|
||||||
header('Refresh: 0; ' . $uri);
|
|
||||||
} else {
|
|
||||||
header('Location: ' . $uri);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns array with tables of given db with extended information and grouped
|
* returns array with tables of given db with extended information and grouped
|
||||||
*
|
*
|
||||||
@@ -2956,4 +2885,4 @@ function PMA_selectUploadFile($import_list, $uploaddir) {
|
|||||||
echo '<i>There are no files to upload</i>';
|
echo '<i>There are no files to upload</i>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -502,4 +502,75 @@ function PMA_getenv($var_name) {
|
|||||||
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send HTTP header, taking IIS limits into account (600 seems ok)
|
||||||
|
*
|
||||||
|
* @uses PMA_IS_IIS
|
||||||
|
* @uses PMA_COMING_FROM_COOKIE_LOGIN
|
||||||
|
* @uses PMA_get_arg_separator()
|
||||||
|
* @uses SID
|
||||||
|
* @uses strlen()
|
||||||
|
* @uses strpos()
|
||||||
|
* @uses header()
|
||||||
|
* @uses session_write_close()
|
||||||
|
* @uses headers_sent()
|
||||||
|
* @uses function_exists()
|
||||||
|
* @uses debug_print_backtrace()
|
||||||
|
* @uses trigger_error()
|
||||||
|
* @uses defined()
|
||||||
|
* @param string $uri the header to send
|
||||||
|
* @return boolean always true
|
||||||
|
*/
|
||||||
|
function PMA_sendHeaderLocation($uri)
|
||||||
|
{
|
||||||
|
if (PMA_IS_IIS && strlen($uri) > 600) {
|
||||||
|
|
||||||
|
echo '<html><head><title>- - -</title>' . "\n";
|
||||||
|
echo '<meta http-equiv="expires" content="0">' . "\n";
|
||||||
|
echo '<meta http-equiv="Pragma" content="no-cache">' . "\n";
|
||||||
|
echo '<meta http-equiv="Cache-Control" content="no-cache">' . "\n";
|
||||||
|
echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n";
|
||||||
|
echo '<script type="text/javascript">' . "\n";
|
||||||
|
echo '//<![CDATA[' . "\n";
|
||||||
|
echo 'setTimeout("window.location = unescape(\'"' . $uri . '"\')", 2000);' . "\n";
|
||||||
|
echo '//]]>' . "\n";
|
||||||
|
echo '</script>' . "\n";
|
||||||
|
echo '</head>' . "\n";
|
||||||
|
echo '<body>' . "\n";
|
||||||
|
echo '<script type="text/javascript">' . "\n";
|
||||||
|
echo '//<![CDATA[' . "\n";
|
||||||
|
echo 'document.write(\'<p><a href="' . $uri . '">' . __('Go') . '</a></p>\');' . "\n";
|
||||||
|
echo '//]]>' . "\n";
|
||||||
|
echo '</script></body></html>' . "\n";
|
||||||
|
|
||||||
|
} else {
|
||||||
|
if (SID) {
|
||||||
|
if (strpos($uri, '?') === false) {
|
||||||
|
header('Location: ' . $uri . '?' . SID);
|
||||||
|
} else {
|
||||||
|
$separator = PMA_get_arg_separator();
|
||||||
|
header('Location: ' . $uri . $separator . SID);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
session_write_close();
|
||||||
|
if (headers_sent()) {
|
||||||
|
if (function_exists('debug_print_backtrace')) {
|
||||||
|
echo '<pre>';
|
||||||
|
debug_print_backtrace();
|
||||||
|
echo '</pre>';
|
||||||
|
}
|
||||||
|
trigger_error('PMA_sendHeaderLocation called when headers are already sent!', E_USER_ERROR);
|
||||||
|
}
|
||||||
|
// bug #1523784: IE6 does not like 'Refresh: 0', it
|
||||||
|
// results in a blank page
|
||||||
|
// but we need it when coming from the cookie login panel)
|
||||||
|
if (PMA_IS_IIS && defined('PMA_COMING_FROM_COOKIE_LOGIN')) {
|
||||||
|
header('Refresh: 0; ' . $uri);
|
||||||
|
} else {
|
||||||
|
header('Location: ' . $uri);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
Reference in New Issue
Block a user