[livejournal] r18531: LJSUP-7961: Add ability to display defau...

U   trunk/cgi-bin/cleanhtml.pl

Modified: trunk/cgi-bin/cleanhtml.pl
===================================================================
--- trunk/cgi-bin/cleanhtml.pl	2011-03-14 07:46:18 UTC (rev 18530)
+++ trunk/cgi-bin/cleanhtml.pl	2011-03-14 08:18:09 UTC (rev 18531)
@@ -411,7 +411,7 @@
             ##      <lj-userpic> - current journal's default userpic
             ##      <lj-userpic remote> - remote user's default userpic
             ##      <lj-userpic user="test"> - test's default userpic
-            if ($tag eq "lj-userpic"){
+            if ($tag eq "lj-userpic" and $action{$tag} ne 'deny'){
                 my $u = '';
                 if ($attr->{user}){
                     $u = LJ::load_user($attr->{user});
@@ -1520,7 +1520,7 @@
 
 my $subject_eat = [qw[head title style layer iframe applet object param]];
 my $subject_allow = [qw[a b i u em strong cite]];
-my $subject_remove = [qw[bgsound embed object caption link font noscript]];
+my $subject_remove = [qw[bgsound embed object caption link font noscript lj-userpic]];
 sub clean_subject
 {
     my $ref = shift;