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

bug #3957 Cookies must be enabled past this point

Browse Source
This commit is contained in:
Marc Delisle 2013-05-28 08:46:04 -04:00
parent 362b11fabd
commit ec6a47d8a0
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- bug #3927 List of tables is missing after expanding in the navigation frame
- bug #3942 Warnings about reserved word for many non reserved words
- bug #3912 Exporting row selection, resulted by ORDER BY query
- bug #3957 Cookies must be enabled past this point
4.0.2.0 (2013-05-24)
- bug #3902 Cannot browse when table name contains keyword "call"

8
libraries/Header.class.php
View File

@ -613,14 +613,6 @@ class PMA_Header
{
$retval = '';
if ($this->_warningsEnabled) {
// message of "Cookies required" displayed for auth_type http or config
// note: here, the decoration won't work because without cookies,
// our standard CSS is not operational
if (empty($_COOKIE)) {
$retval .= PMA_Message::notice(
__('Cookies must be enabled past this point.')
)->getDisplay();
}
$retval .= "<noscript>";
$retval .= PMA_message::error(
__("Javascript must be enabled past this point")

8
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -262,14 +262,6 @@ class AuthenticationCookie extends AuthenticationPlugin
Swekey_login('input_username', 'input_go');
// END Swekey Integration
// show the "Cookies required" message only if cookies are disabled
// (we previously tried to set some cookies)
if (empty($_COOKIE)) {
trigger_error(
__('Cookies must be enabled past this point.'),
E_USER_NOTICE
);
}
if ($GLOBALS['error_handler']->hasDisplayErrors()) {
echo '<div>';
$GLOBALS['error_handler']->dispErrors();

2
libraries/session.inc.php
View File

@ -89,7 +89,7 @@ if (! isset($_COOKIE[$session_name])) {
* Session initialization is done before selecting language, so we
* can not use translations here.
*/
PMA_fatalError('Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.');
PMA_fatalError('Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly. Also ensure that cookies are enabled in your browser.');
}
unset($orig_error_count);
} else {