Retain attachment dir indexes

When running the repair_settings with attachments directories
with non continous indexes, the indexes was reset to a continous
index. If one of the reindexed directories was selected as current
attachment directory, it would point to the wrong, or non existing
attachment directory index. Fix this by passing and using the current
indexes.

Non coninous indexes can happen if an attachment directory is removed
that is not the last.

Signed-off-by: Oscar Rydhé <[email protected]>

Author: BrickOzp

repair_settings.php

@@ -773,10 +773,9 @@ function restoreAll()
 				if (!(isset($array_settings) && is_array($array_settings)) && !is_array($settings[$setting]))
 					$array_settings = @unserialize($settings[$setting]);
 				if (!isset($array_settings) || !is_array($array_settings))
-					$array_settings = array($settings[$setting]);
+					$array_settings = array(1 => $settings[$setting]);
 
-				$item = 1;
-				foreach ($array_settings as $array_setting)
+				foreach ($array_settings as $item => $array_setting)
 				{
 					$suggested = false;
 					echo '
@@ -1051,11 +1050,11 @@ function set_settings()
 	}
 	else
 	{
-		$attach_count = 1;
 		foreach ($setString as $key => $value)
 			if (strpos($value[0], 'attachmentUploadDir') == 0 && strpos($value[0], 'attachmentUploadDir') !== false)
 			{
-				$attach_dirs[$attach_count++] = $value[1];
+				$index = substr($value[0], strlen('attachmentUploadDir_'));
+				$attach_dirs[$index] = $value[1];
 				unset($setString[$key]);
 			}
 	}