Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-01-19 17:30:27 +01:00
commit 493d94ed8d
2 changed files with 2 additions and 1 deletions

View File

@ -93,6 +93,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3598736 [routines] Editing a procedure with special characters
- bug #3600322 [core] Visualize GIS data throws Fatal Error
- bug #3599362 [core] Double-escaped error message
- bug #3776 [cookies] Login without auth on second server
3.5.5.0 (2012-12-21)
- bug #3563824 [export] Support Apache's mod_deflate

View File

@ -1755,7 +1755,7 @@ class PMA_Config
if (! isset($_COOKIE[$cookie]) || $_COOKIE[$cookie] !== $value) {
// set cookie with new value
/* Calculate cookie validity */
if ($validity == null) {
if ($validity === null) {
$validity = time() + 2592000;
} elseif ($validity == 0) {
$validity = 0;