fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2011-01-13 04:39 am

[dw-free] Reply pages need to follow entry preferences

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

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

Apply entry style setting to reply pages as well.

Patch by [personal profile] foxfirefey.

Files modified:
  • cgi-bin/LJ/User.pm
  • cgi-bin/weblib.pl
--------------------------------------------------------------------------------
diff -r 4ce458a16452 -r 7c72e84a2a8e cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm	Thu Jan 13 12:23:24 2011 +0800
+++ b/cgi-bin/LJ/User.pm	Thu Jan 13 12:38:54 2011 +0800
@@ -5733,7 +5733,7 @@ sub viewing_style {
     my %style_types = ( O => "original", M => "mine", S => "site", L => "light" );
 
     my $style;
-    if ( $view eq "entry" ) {
+    if ( $view eq "entry" || $view eq "reply" ) {
         $style = $style_types{ $u->opt_viewentrystyle };
     } else {
         $style = $style_types{ $u->opt_viewjournalstyle };
diff -r 4ce458a16452 -r 7c72e84a2a8e cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Thu Jan 13 12:23:24 2011 +0800
+++ b/cgi-bin/weblib.pl	Thu Jan 13 12:38:54 2011 +0800
@@ -3102,7 +3102,7 @@ LOGIN_BAR
         if ( $view_type eq "mine" and $current_style ne $view_type and $remote and not $remote->equals( $journal ) ) {
             push @view_options, "<a href='" . $make_style_link->( $view_type ) . "'>" .
                 LJ::Lang::ml( 'web.controlstrip.reloadpage.mystyle2' ) . "</a>";
-        } elsif ( $view_type eq "site" and $current_style ne $view_type and $view eq "entry" ) {
+        } elsif ( $view_type eq "site" and $current_style ne $view_type and ( $view eq "entry" or $view eq "reply" ) ) {
             push @view_options, "<a href='" . $make_style_link->( $view_type ) . "'>" .
                 LJ::Lang::ml( 'web.controlstrip.reloadpage.sitestyle' ) . "</a>";
         } elsif ( $view_type eq "light" and $current_style ne $view_type ) {
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org