[livejournal] r21640: LJSUP-11718: There is no widget on entry...

LJSUP-11718: There is no widget on entry page

U   trunk/cgi-bin/LJ/S2.pm
U   trunk/cgi-bin/ljviews.pl
U   trunk/htdocs/talkpost.bml
U   trunk/htdocs/talkread.bml

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2012-04-04 15:06:58 UTC (rev 21639)
+++ trunk/cgi-bin/LJ/S2.pm	2012-04-05 06:48:51 UTC (rev 21640)
@@ -1984,8 +1984,8 @@
 
     my $p = $arg->{'props'};
     if ($p->{'current_music'}) {
+        LJ::CleanHTML::clean_subject(\$e->{'metadata'}->{'music'});
         $e->{'metadata'}->{'music'} = LJ::Setting::Music::format_current_music_string($p->{'current_music'});
-        LJ::CleanHTML::clean_subject(\$e->{'metadata'}->{'music'});
     }
     if (my $mid = $p->{'current_moodid'}) {
         my $theme = defined $arg->{'moodthemeid'} ? $arg->{'moodthemeid'} : $u->{'moodthemeid'};

Modified: trunk/cgi-bin/ljviews.pl
===================================================================
--- trunk/cgi-bin/ljviews.pl	2012-04-04 15:06:58 UTC (rev 21639)
+++ trunk/cgi-bin/ljviews.pl	2012-04-05 06:48:51 UTC (rev 21640)
@@ -1002,9 +1002,8 @@
 
 sub current_music_str {
     my $val = shift;
-
-    $val = LJ::Setting::Music::format_current_music_string($val);
     LJ::CleanHTML::clean_subject(\$val);
+    $val = LJ::Setting::Music::format_current_music_string($val);
     return $val;
 }
 

Modified: trunk/htdocs/talkpost.bml
===================================================================
--- trunk/htdocs/talkpost.bml	2012-04-04 15:06:58 UTC (rev 21639)
+++ trunk/htdocs/talkpost.bml	2012-04-05 06:48:51 UTC (rev 21640)
@@ -348,8 +348,8 @@
         $current{'Mood'} = "$moodpic$moodname";
     }
     if ($props->{'current_music'}) {
-        $current{'Music'} = LJ::LastFM::format_current_music_string($props->{'current_music'});
         LJ::CleanHTML::clean_subject(\$current{'Music'});
+        $current{'Music'} = LJ::Setting::Music::format_current_music_string($props->{'current_music'});
     }
 
     if ($props->{'current_location'} || $props->{'current_coords'}) {

Modified: trunk/htdocs/talkread.bml
===================================================================
--- trunk/htdocs/talkread.bml	2012-04-04 15:06:58 UTC (rev 21639)
+++ trunk/htdocs/talkread.bml	2012-04-05 06:48:51 UTC (rev 21640)
@@ -454,11 +454,11 @@
             my $curkey = "talk.curname_" . $_;
             my $curname = BML::ml($curkey);
             $curname = "<b>Current $_:</b>" unless $curname;
-         
+
             $ret .= "<tr><td align=right>$curname</td>";
-         
+
             if ($_ eq 'Music') {
-                $ret .= "<td>" . LJ::LastFM::format_current_music_string($current{$_}) . "</td></tr>\n";
+                $ret .= "<td>" . LJ::Setting::Music::format_current_music_string($current{$_}) . "</td></tr>\n";
             } else {
                 $ret .= "<td>$current{$_}</td></tr>\n";
             }