bug #1746186 LeftLogoLink fails if set to some external site
This commit is contained in:
parent
5b6c3d7867
commit
19476e5639
@ -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)
|
||||
|
||||
|
||||
@ -1255,7 +1255,8 @@ ALTER TABLE `pma_column_comments`
|
||||
|
||||
<dt id="cfg_LeftLogoLinkWindow">$cfg['LeftLogoLinkWindow'] string</dt>
|
||||
<dd>Whether to open the linked page in the main window (<tt>main</tt>)
|
||||
or in a new one (<tt>new</tt>).</dd>
|
||||
or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are
|
||||
linking to <tt>phpmyadmin.net</tt>.</dd>
|
||||
|
||||
<dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
|
||||
<dd>Defines whether or not to display a server choice at the top of the left frame.
|
||||
|
||||
@ -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 . '</a>' . "\n"
|
||||
.'</div>' . "\n";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user