bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-17 08:48:14 +05:30
parent bfac73dafd
commit ed357d7716
3 changed files with 7 additions and 6 deletions

View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug #4961 Javascript error when Designer is opened
- bug #4962 Insert by foreign key scrolls page to top
- bug #4955 Clicking on the navi logo does not always work
- bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked
4.4.9.0 (2015-06-04)
- bug #4920 relation view doesn't list fields of table in other database

View File

@ -1524,9 +1524,9 @@ Navigation panel setup
:type: string
:default: ``'index.php'``
Enter :term:`URL` where logo in the
navigation panel will point to. For use especially with self made
theme which changes this.
Enter :term:`URL` where logo in the navigation panel will point to.
For use especially with self made theme which changes this.
For external :term:`URL`s, you should include URL scheme as well.
.. config:option:: $cfg['NavigationLogoLinkWindow']

View File

@ -107,10 +107,10 @@ class PMA_NavigationHeader
break;
case 'main':
// do not add our parameters for an external link
$navLogoLinkLower = /*overload*/mb_strtolower(
$GLOBALS['cfg']['NavigationLogoLink']
$host = parse_url(
$GLOBALS['cfg']['NavigationLogoLink'], PHP_URL_HOST
);
if (/*overload*/mb_substr($navLogoLinkLower, 0, 4) !== '://') {
if (empty($host)) {
$retval .= PMA_URL_getCommon() . '"';
} else {
$retval .= '" target="_blank"';