add back MergeMetadataAndImagesByName

Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs

MediaBrowser.Api/StartupWizardService.cs

@@ -71,6 +71,7 @@ namespace MediaBrowser.Api
             _config.Configuration.DisableStartupScan = true;
             _config.Configuration.EnableUserViews = true;
             _config.Configuration.EnableDateLastRefresh = true;
+            _config.Configuration.MergeMetadataAndImagesByName = true;
             _config.SaveConfiguration();
         }
 

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -180,6 +180,8 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The dashboard source path.</value>
         public string DashboardSourcePath { get; set; }
 
+        public bool MergeMetadataAndImagesByName { get; set; }
+
         /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>

MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs

@@ -35,6 +35,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
         public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
             : base(applicationPaths, logManager, xmlSerializer, fileSystem)
         {
+            UpdateItemsByNamePath();
             UpdateMetadataPath();
         }
 
@@ -72,6 +73,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
         /// </summary>
         protected override void OnConfigurationUpdated()
         {
+            UpdateItemsByNamePath();
             UpdateMetadataPath();
 
             base.OnConfigurationUpdated();
@@ -84,6 +86,19 @@ namespace MediaBrowser.Server.Implementations.Configuration
             UpdateTranscodingTempPath();
         }
 
+        /// <summary>
+        /// Updates the items by name path.
+        /// </summary>
+        private void UpdateItemsByNamePath()
+        {
+            if (!Configuration.MergeMetadataAndImagesByName)
+            {
+                ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
+                    null :
+                    Configuration.ItemsByNamePath;
+            }
+        }
+
         /// <summary>
         /// Updates the metadata path.
         /// </summary>