N°2482 Regression on mandatory external field with only 1 value

application/cmdbabstract.class.inc.php

@@ -2178,11 +2178,14 @@ EOF
 									if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
 									{
 										// When there is only once choice, select it by default
-										$oPage->add_ready_script(
-											<<<EOF
+										if($value != $key)
+										{
+											$oPage->add_ready_script(
+												<<<EOF
 $('#$iId').attr('data-validate','dependencies');
 EOF
-										);
+											);
+										}
 										$sSelected = ' selected';
 									}
 									else

application/ui.extkeywidget.class.inc.php

@@ -208,11 +208,14 @@ class UIExtKeyWidget
 					{
 						// When there is only once choice, select it by default
 						$sSelected = 'selected';
-						$oPage->add_ready_script(
-							<<<EOF
+						if($value != $key)
+						{
+							$oPage->add_ready_script(
+								<<<EOF
 $('#$this->iId').attr('data-validate','dependencies');
 EOF
-						);
+							);
+						}
 					}
 					else
 					{

setup/backup.class.inc.php

@@ -448,8 +448,8 @@ EOF;
 
 			// Note: opt implicitely sets lock-tables... which cancels the benefit of single-transaction!
 			//       skip-lock-tables compensates and allows for writes during a backup
-			$sCommand = "$sMySQLDump --defaults-file=\"$sMySQLDumpCnfFile\" --opt --skip-lock-tables --default-character-set=".$sMysqldumpCharset." --add-drop-database --single-transaction --host=$sHost $sPortOption --user=$sUser $sTlsOptions --result-file=$sTmpFileName $sDBName $sTables 2>&1";
-			$sCommandDisplay = "$sMySQLDump --defaults-file=\"$sMySQLDumpCnfFile\" --opt --skip-lock-tables --default-character-set=".$sMysqldumpCharset." --add-drop-database --single-transaction --host=$sHost $sPortOption --user=xxxxx $sTlsOptions --result-file=$sTmpFileName $sDBName $sTables";
+			$sCommand = "$sMySQLDump --defaults-extra-file=\"$sMySQLDumpCnfFile\" --opt --skip-lock-tables --default-character-set=".$sMysqldumpCharset." --add-drop-database --single-transaction --host=$sHost $sPortOption --user=$sUser $sTlsOptions --result-file=$sTmpFileName $sDBName $sTables 2>&1";
+			$sCommandDisplay = "$sMySQLDump --defaults-extra-file=\"$sMySQLDumpCnfFile\" --opt --skip-lock-tables --default-character-set=".$sMysqldumpCharset." --add-drop-database --single-transaction --host=$sHost $sPortOption --user=xxxxx $sTlsOptions --result-file=$sTmpFileName $sDBName $sTables";
 
 			// Now run the command for real
 			$this->LogInfo("backup: generate data file with command: $sCommandDisplay");