Document previous foreign-key dropdown work, and also ensure that the configuration import code works properly with it.

Documentation.html

@@ -1233,6 +1233,26 @@ Defaults to FALSE (drop-down). <br />
         <br /><br />
         </dd>
 
+    <dt><b>$cfg['InsertRows']</b> integer</dt>
+    <dd>
+        Defines the maximum number of concurrent entries for the Insert page.
+    </dd>
+
+    <dt><b>$cfg['ForeignKeyMaxLimit']</b> integer</dt>
+    <dd>
+    If there are fewer items than this in the set of foreign keys, then a
+    drop-down box of foreign keys is presented, in the style described by the 
+    <b>$cfg['ForeignKeyDropdownOrder']</b> setting.
+    </dd>
+
+    <dt><b>$cfg['ForeignKeyDropdownOrder']</b> array</dt>
+    <dd>
+        For the foreign key drop-down fields, there are several methods of
+        display, offering both the key and value data. The contents of the
+        array should be one or both of the following strings:
+        <i>'content-id'</i>, <i>'id-content'</i>.
+    </dd>
+
     <dt>
         <b>$cfg['ZipDump'] </b>boolean<br />
         <b>$cfg['GZipDump'] </b>boolean<br />

config.inc.php

@@ -275,12 +275,10 @@ $cfg['CharEditing']           = 'input';
                                         //  input - allows limiting of input length
                                         //  textarea - allows newlines in fields
 $cfg['InsertRows']            = 2;      // How many rows can be inserted at one time
-$cfg['ForeignKeyDropdownOrder'] = array(
+
-'content-id'
+$cfg['ForeignKeyDropdownOrder'] =       // Sort order for items in a foreign-key dropdown box. 
-//, 
+    array( 'content-id', 'id-content'); // 'content' is the referenced data, 'id' is the key value.
-//'id-content'
+$cfg['ForeignKeyMaxLimit'] = 100;       // A dropdown will be used if fewer items are present
-); // Sort order for items in a foreign-key dropdown box. 
-$cfg['ForeignKeyMaxLimit'] = 100; // If less items than this exist, a dropdown will be used.
 
 
 // For the export features...

libraries/common.lib.php

@@ -142,7 +142,7 @@ if (isset($cfg['FileRevision'])) {
 } else {
     $cfg['FileRevision'] = array(1, 1);
 }
-if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 58)) {
+if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 59)) {
     require_once('./libraries/config_import.lib.php');
 }
 

libraries/config_import.lib.php

@@ -478,6 +478,14 @@ if (!isset($cfg['InsertRows'])) {
     $cfg['InsertRows'] = 2;
 }
 
+if (!isset($cfg['ForeignKeyDropdownOrder'])) {
+    $cfg['ForeignKeyDropdownOrder'] = array( 'content-id', 'id-content');
+}
+
+if (!isset($cfg['ForeignKeyMaxLimit'])) {
+    $cfg['ForeignKeyMaxLimit'] = 100;
+}
+
 if (!isset($cfg['ZipDump'])) {
     if (isset($cfgZipDump)) {
         $cfg['ZipDump'] = $cfgZipDump;