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

Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Browse Source
This commit is contained in:
Weblate 2012-11-05 14:23:39 +01:00
commit c4546b99df
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug #3577468 [display] Incorrect imagejpeg Syntax Breaks Image Transformation
- bug #3578776 [search] Editing SQL not possible when no records found
- bug #3571970 [interface] Display chart and number of rows to plot
- bug #3582631 [core] Wrong redirect url caused cookies error with ForceSSL
3.5.3.0 (2012-10-08)
- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore

2
libraries/common.inc.php
View File

@ -351,7 +351,7 @@ if ($GLOBALS['PMA_Config']->get('ForceSSL')
} else {
$port_number = 443;
}
$url = 'https://' . $parsed['host'] . ':' . $port_number . '/' . $parsed['path'];
$url = 'https://' . $parsed['host'] . ':' . $port_number . $parsed['path'];
}
// Actually redirect
PMA_sendHeaderLocation($url . PMA_generate_common_url($_GET, 'text'));