Merge pull request #1701 from sarken/issue_2776

2776 Advanced shouldn't be open if no media is set
otwcode · Jun 10, 2014 · dfae6ee · dfae6ee
2 parents b2783d7 + 7b15e72
commit dfae6ee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/helpers/skins_helper.rb b/app/helpers/skins_helper.rb
@@ -48,7 +48,7 @@ def get_skin_cache(skin)
   def show_advanced_skin?(skin)
     !skin.new_record? && 
       (skin.role != Skin::DEFAULT_ROLE ||
-        skin.media != Skin::DEFAULT_MEDIA ||
+        (skin.media.present? && skin.media != Skin::DEFAULT_MEDIA) ||
         skin.ie_condition.present? ||
         skin.unusable? ||
         !skin.skin_parents.empty?)