[dw-free] When previewing a theme for your current layout, user layer is applied

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/c41810298e06]

http://bugs.dwscoalition.org/show_bug.cgi?id=2066

Don't apply user layers when previewing styles.

Patch by afuna.

Files modified:

• cgi-bin/LJ/S2Theme.pm

--------------------------------------------------------------------------------
diff -r 451c8458da72 -r c41810298e06 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Tue Dec 01 02:05:48 2009 +0000
+++ b/cgi-bin/LJ/S2Theme.pm	Tue Dec 01 02:38:56 2009 +0000
@@ -626,7 +626,6 @@ sub get_preview_styleid {
     # we don't have a style for this theme, so get the new layers and set them to _for_preview directly
     my %style = LJ::S2::get_style($u);
     my $i18n_layer = $self->get_custom_i18n_layer_for_theme($u);
-    my $user_layer = $self->get_custom_user_layer_for_theme($u);
     
     # for the i18nc layer, match the user's preferences if they're not switching cores
     # if they are switching cores, we don't know what the equivalent should be
@@ -638,7 +637,6 @@ sub get_preview_styleid {
         layout => $self->layoutid,
         i18n   => $i18n_layer,
         theme  => $self->themeid,
-        user   => $user_layer,
     );
     LJ::S2::set_style_layers($u, $styleid, %layers);
 
--------------------------------------------------------------------------------