diff --git a/ChangeLog b/ChangeLog
index 79a8d98dce..3b947c5585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ [display] Support for MySQL 5.0.37 profiling
+ RFE #1743983 [gui] Replace $max_characters by a configurable param:
$cfg['MaxCharactersInDisplayedSQL']
+- bug #1746186 LeftLogoLink fails if set to some external site
2.10.3.0 (not yet released)
diff --git a/Documentation.html b/Documentation.html
index acbb3316ac..423d7e8941 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1255,7 +1255,8 @@ ALTER TABLE `pma_column_comments`
$cfg['LeftLogoLinkWindow'] string
Whether to open the linked page in the main window (main)
- or in a new one (new).
+ or in a new one (new). Note: use new if you are
+ linking to phpmyadmin.net.
$cfg['LeftDisplayServers'] boolean
Defines whether or not to display a server choice at the top of the left frame.
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 3ed043cdba..7fabca8196 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -31,7 +31,12 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
echo '" target="_blank"';
break;
case 'main':
- echo '?' . $query_url . '" target="frame_content"';
+ // do not add our parameters for an external link
+ if (substr(strtolower($GLOBALS['cfg']['LeftLogoLink']), 0, 4) !== 'http') {
+ echo '?' . $query_url . '" target="frame_content"';
+ } else {
+ echo '"';
+ }
}
echo '>' . $logo . '' . "\n"
.'' . "\n";