Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

ChangeLog

@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - bug #4720 No error message on Missing extension mbstring
 + rfe #801  Builtin transformations and relations
 + rfe #767 USING BTREE support for HEAP/MEMORY tables
++ rfe #1596 Make "Options > Relational" configurable
 
 4.3.9.0 (not yet released)
 - bug #4728 Incorrect headings in routine editor

doc/config.rst

@@ -1723,6 +1723,14 @@ Browse mode
     Defines which action (``double-click`` or ``click``) triggers grid
     editing. Can be deactived with the ``disabled`` value.
 
+.. config:option:: $cfg['RelationalDisplay']
+
+    :type: string
+    :default: ``'K'``
+
+    Defines the initial behavior for Options > Relational. ``K``, which
+    is the default, displays the key while ``D`` shows the display column.
+
 .. config:option:: $cfg['SaveCellsAtOnce']
 
     :type: boolean

libraries/DisplayResults.class.php

@@ -3909,7 +3909,10 @@ class PMA_DisplayResults
             $query['relational_display'] = $_REQUEST['relational_display'];
             unset($_REQUEST['relational_display']);
         } elseif (empty($query['relational_display'])) {
-            $query['relational_display'] = self::RELATIONAL_KEY;
+            // The current session value has priority over a
+            // change via Settings; this change will be apparent
+            // starting from the next session
+            $query['relational_display'] = $GLOBALS['cfg']['RelationalDisplay'];
         }
 
         if (PMA_isValid(

libraries/config.default.php

@@ -1102,6 +1102,19 @@ $cfg['SaveCellsAtOnce'] = false;
  */
 $cfg['GridEditing'] ='double-click';
 
+/**
+ * Options > Relational display
+ *
+ * Possible values:
+ * 'K' for key value
+ * 'D' for display column
+ *
+ * @global string $cfg['RelationalDisplay']
+ *
+ */
+
+$cfg['RelationalDisplay'] = 'K';
+
 
 /*******************************************************************************
  * In edit mode...

libraries/config.values.php

@@ -94,6 +94,10 @@ $cfg_db['GridEditing'] = array(
     'double-click' => __('Double click'),
     'disabled' => __('Disabled'),
 );
+$cfg_db['RelationalDisplay'] = array(
+    'K' => __('key'),
+    'D' => __('display column')
+);
 $cfg_db['DefaultTabServer'] = array(
     'index.php',               // the welcome page (recommended for multiuser setups)
     'server_databases.php',    // list of databases

libraries/config/messages.inc.php

@@ -532,6 +532,8 @@ $strConfigRepeatCells_desc
 $strConfigRepeatCells_name = __('Repeat headers');
 $strConfigRestoreDefaultValue = __('Restore default value');
 $strConfigGridEditing_name = __('Grid editing: trigger action');
+$strConfigRelationalDisplay_name = __('Relational display');
+$strConfigRelationalDisplay_desc = __('For display Options');
 $strConfigSaveCellsAtOnce_name = __('Grid editing: save all edited cells at once');
 $strConfigSaveDir_desc = __('Directory where exports can be saved on server.');
 $strConfigSaveDir_name = __('Save directory');

libraries/config/setup.forms.php

@@ -212,7 +212,8 @@ $forms['Main_panel']['Browse'] = array(
     'LimitChars',
     'RowActionLinks',
     'TablePrimaryKeyOrder',
-    'RememberSorting');
+    'RememberSorting',
+    'RelationalDisplay');
 $forms['Main_panel']['Edit'] = array(
     'ProtectBinary',
     'ShowFunctionFields',

libraries/config/user_preferences.forms.php

@@ -120,7 +120,8 @@ $forms['Main_panel']['Browse'] = array(
     'LimitChars',
     'RowActionLinks',
     'TablePrimaryKeyOrder',
-    'RememberSorting');
+    'RememberSorting',
+    'RelationalDisplay');
 $forms['Main_panel']['Edit'] = array(
     'ProtectBinary',
     'ShowFunctionFields',