holyandrew (holyandrew) wrote in changelog,
holyandrew
holyandrew
changelog

[livejournal] r23236: LJSUP-13907: Video placeholders should b...

Committer: akanashin
LJSUP-13907: Video placeholders should be on the page instead of video
U   trunk/cgi-bin/LJ/S2/FriendsPage.pm
U   trunk/cgi-bin/cleanhtml.pl
Modified: trunk/cgi-bin/LJ/S2/FriendsPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/FriendsPage.pm	2012-11-01 11:05:38 UTC (rev 23235)
+++ trunk/cgi-bin/LJ/S2/FriendsPage.pm	2012-11-01 11:31:05 UTC (rev 23236)
@@ -359,7 +359,7 @@
                  'posterid'            => $entry_obj->posterid,
                  'img_placeholders'    => $replace_images_in_friendspage,
                  'video_placeholders'  => $replace_video,
-                 'friendsfeed'         => 1,
+                 'embedplaceholders'   => 1,
         });
 
         LJ::expand_embedded(

Modified: trunk/cgi-bin/cleanhtml.pl
===================================================================
--- trunk/cgi-bin/cleanhtml.pl	2012-11-01 11:05:38 UTC (rev 23235)
+++ trunk/cgi-bin/cleanhtml.pl	2012-11-01 11:31:05 UTC (rev 23236)
@@ -161,7 +161,7 @@
     my %remove_attribs = ($opts->{'remove_attribs'}) ?
         (map {$_ => 1} @{ $opts->{'remove_attribs'} }) : ();
     my $remove_positioning = $opts->{'remove_positioning'} || 0;
-    my $friendsfeed = $opts->{'friendsfeed'} || 0;
+    my $embedplaceholders = $opts->{'embedplaceholders'} || 0;
     my $target = $opts->{'target'} || '';
     my $ljrepost_allowed = ($opts->{ljrepost_allowed} && ! $opts->{'textonly'}) || 0;
     my $cut_retrieve     =  $opts->{cut_retrieve} || 0;
@@ -759,7 +759,7 @@
                         if ($entry && $entry->valid) {
                             $ditemid = $entry->ditemid;
                         }
-                        $data_ids = qq(data-widget='ljcut' data-widget-options='{ "journalid": "$journalid", "ditemid": "$ditemid", "cutid": "$cutcount", "friendsfeed" : "$friendsfeed" }');
+                        $data_ids = qq(data-widget='ljcut' data-widget-options='{ "journalid": "$journalid", "ditemid": "$ditemid", "cutid": "$cutcount", "embedplaceholders" : $embedplaceholders }');
                     }
                     $newdata .= "<b $data_ids class=\"ljcut-link lj-widget\"><span class='ljcut-brace'>(&nbsp;</span><span class=\"ljcut-decor\"><a href=\"$url#cutid$cutcount\" class=\"ljcut-link-expand\">$etext</a>";
                     $newdata .= "<a href=\"$url#cutid$cutcount\" class=\"ljcut-link-collapse\">".Encode::decode_utf8(LJ::Lang::ml("ljcut.collapse"))."</a>" unless $opts->{no_ljcut_collapse};

Tags: akanashin, holyandrew, livejournal, pl, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments