Renamed configuration directive: LeftLogoLink => NavigationLogoLink

phpmyadmin · Oct 30, 2012 · 5940cf2 · 5940cf2
1 parent b0f5dd2
commit 5940cf2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -63,6 +63,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 + Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable
 + Renamed configuration directive: LeftDisplayTableFilterMinimum => NavigationTreeDisplayTableFilterMinimum
 + Renamed configuration directive: LeftDisplayLogo => NavigationDisplayLogo
++ Renamed configuration directive: LeftLogoLink => NavigationLogoLink
 
 3.5.4.0 (not yet released)
 - bug #3570212 [edit] uuid_short() is a no-arguments function

diff --git a/Documentation.html b/Documentation.html
@@ -1560,7 +1560,7 @@ <h2 id="config">Configuration</h2>
     <dt id="cfg_NavigationDisplayLogo">$cfg['NavigationDisplayLogo'] boolean</dt>
     <dd>Defines whether or not to display the phpMyAdmin logo at the top of the left frame.
         Defaults to <code>TRUE</code>.</dd>
-    <dt id="cfg_LeftLogoLink">$cfg['LeftLogoLink'] string</dt>
+    <dt id="cfg_NavigationLogoLink">$cfg['NavigationLogoLink'] string</dt>
     <dd>Enter <abbr title="Uniform Resource Locator">URL</abbr> where logo in the navigation frame will point to.
     For use especially with self made theme which changes this.
     The default value for this is <code>main.php</code>.</dd>

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -837,9 +837,9 @@
 /**
  * where should logo link point to (can also contain an external URL)
  *
- * @global string $cfg['LeftLogoLink']
+ * @global string $cfg['NavigationLogoLink']
  */
-$cfg['LeftLogoLink'] = 'index.php';
+$cfg['NavigationLogoLink'] = 'index.php';
 
 /**
  * whether to open the linked page in the main window ('main') or

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
@@ -271,8 +271,6 @@
 $strConfigLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
 $strConfigLeftDisplayServers_name = __('Display servers selection');
 $strConfigLeftDisplayDatabaseFilterMinimum_name = __('Minimum number of databases to display the database filter box');
-$strConfigLeftLogoLink_desc = __('URL where logo in the navigation frame will point to');
-$strConfigLeftLogoLink_name = __('Logo link URL');
 $strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
 $strConfigLeftLogoLinkWindow_name = __('Logo link target');
 $strConfigLeftRecentTable_desc = __('Maximum number of recently used tables; set 0 to disable');
@@ -307,6 +305,8 @@
 $strConfigMemoryLimit_name = __('Memory limit');
 $strConfigNavigationDisplayLogo_desc = __('Show logo in left frame');
 $strConfigNavigationDisplayLogo_name = __('Display logo');
+$strConfigNavigationLogoLink_desc = __('URL where logo in the navigation frame will point to');
+$strConfigNavigationLogoLink_name = __('Logo link URL');
 $strConfigNavigationTreeDefaultTabTable_name = __('Target for quick access icon');
 $strConfigNavigationTreeDisplayItemFilterMinimum_desc = __('Defines the minimum number of items (tables, views, routines and events) to display a filter box.');
 $strConfigNavigationTreeDisplayItemFilterMinimum_name = __('Minimum number of items to display the filter box');

diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
@@ -163,7 +163,7 @@
     'password'));
 $forms['Left_frame']['Left_frame'] = array(
     'NavigationDisplayLogo',
-    'LeftLogoLink',
+    'NavigationLogoLink',
     'LeftLogoLinkWindow',
     'NavigationTreePointerEnable',
     'LeftRecentTable',

diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
@@ -79,7 +79,7 @@
     'SQLQuery/Refresh');
 $forms['Left_frame']['Left_frame'] = array(
     'NavigationDisplayLogo',
-    'LeftLogoLink',
+    'NavigationLogoLink',
     'LeftLogoLinkWindow',
     'NavigationTreePointerEnable',
     'LeftRecentTable',

diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php
@@ -76,17 +76,17 @@ private function _logo()
                     . 'alt="' . $logo . '" id="imgpmalogo" />';
             }
             $retval .= '<div id="pmalogo">';
-            if ($GLOBALS['cfg']['LeftLogoLink']) {
+            if ($GLOBALS['cfg']['NavigationLogoLink']) {
                 $retval .= '    <a href="' . htmlspecialchars(
-                    $GLOBALS['cfg']['LeftLogoLink']
+                    $GLOBALS['cfg']['NavigationLogoLink']
                 );
                 switch ($GLOBALS['cfg']['LeftLogoLinkWindow']) {
                 case 'new':
                     $retval .= '" target="_blank"';
                     break;
                 case 'main':
                     // do not add our parameters for an external link
-                    if (substr(strtolower($GLOBALS['cfg']['LeftLogoLink']), 0, 4) !== '://') {
+                    if (substr(strtolower($GLOBALS['cfg']['NavigationLogoLink']), 0, 4) !== '://') {
                         $retval .= '?' . $GLOBALS['url_query'] . '"';
                     } else {
                         $retval .= '" target="_blank"';