[livejournal] r21551: LJSUP-11352: Partnership with Trava.ru

U   trunk/cgi-bin/LJ/S2.pm
U   trunk/cgi-bin/LJ/Text.pm
U   trunk/cgi-bin/ljviews.pl

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2012-03-27 09:16:55 UTC (rev 21550)
+++ trunk/cgi-bin/LJ/S2.pm	2012-03-27 09:23:22 UTC (rev 21551)
@@ -27,6 +27,7 @@
 use LJ::Request;
 use LJ::Share;
 use LJ::TimeUtil;
+use LJ::Setting::Music;
 
 # TEMP HACK
 sub get_s2_reader {
@@ -1983,7 +1984,7 @@
 
     my $p = $arg->{'props'};
     if ($p->{'current_music'}) {
-        $e->{'metadata'}->{'music'} = LJ::LastFM::format_current_music_string($p->{'current_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'}) {

Modified: trunk/cgi-bin/LJ/Text.pm
===================================================================
--- trunk/cgi-bin/LJ/Text.pm	2012-03-27 09:16:55 UTC (rev 21550)
+++ trunk/cgi-bin/LJ/Text.pm	2012-03-27 09:23:22 UTC (rev 21551)
@@ -260,7 +260,7 @@
         unless $bytes || $chars;
         
     if($strip_html) {
-        $force_ellipsis = ($str =~ /<(img|embed|object|iframe|lj-embed)/i) ? 1 : 0;
+        $force_ellipsis = ($str =~ /<(img|embed|object|iframe|lj\-embed)/i) ? 1 : 0;
         $str = LJ::strip_html($str, { use_space => 1 });
     }
 

Modified: trunk/cgi-bin/ljviews.pl
===================================================================
--- trunk/cgi-bin/ljviews.pl	2012-03-27 09:16:55 UTC (rev 21550)
+++ trunk/cgi-bin/ljviews.pl	2012-03-27 09:23:22 UTC (rev 21551)
@@ -11,6 +11,7 @@
 use vars qw(@themecoltypes);
 use Class::Autouse qw(LJ::LastFM);
 use LJ::TimeUtil;
+use LJ::Setting::Music;
 
 # this used to be in a table, but that was kinda useless
 @themecoltypes = (
@@ -1001,8 +1002,8 @@
 
 sub current_music_str {
     my $val = shift;
-    
-    $val = LJ::LastFM::format_current_music_string($val);
+
+    $val = LJ::Setting::Music::format_current_music_string($val);
     LJ::CleanHTML::clean_subject(\$val);
     return $val;
 }