Fixes on double settings on patches

Ortus-Solutions · Jun 23, 2016 · 1b69302 · 1b69302
1 parent 663d283
commit 1b69302
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/build/patches/3.0.0/Update.cfc b/build/patches/3.0.0/Update.cfc
@@ -217,8 +217,11 @@ component {
 		// Update Theme to layout
 		var oldLayoutSetting = settingService.findWhere( { name="cb_site_layout" } );
 		if( !isNull( oldLayoutSetting ) ){
-			oldLayoutSetting.setName( "cb_site_theme" );
-			settingService.save( entity=oldLayoutSetting );
+			var oSiteTheme = settingService.findWhere( { name="cb_site_theme" } );
+			if( isNull( oSiteTheme ) ){
+				oldLayoutSetting.setName( "cb_site_theme" );
+				settingService.save( entity=oldLayoutSetting );
+			}
 		}
 		// Update Search setting
 		var oSearchSetting = settingService.findWhere( { name="cb_search_adapter" } );