Типа я (zilogic) wrote in changelog,
Типа я
zilogic
changelog

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

Committer: amyshkin
LJSUP-11352: Partnership with Trava.ru
U   trunk/cgi-bin/LJ/Widget/EntryForm.pm
U   trunk/htdocs/editjournal.bml
Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-03-30 15:24:39 UTC (rev 21618)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-04-02 11:09:33 UTC (rev 21619)
@@ -114,7 +114,7 @@
 sub should_show_trava {
     my ($self) = @_;
     return 0 unless LJ::Setting::Music::Trava->good_ip;
-    return $self->opts->{'prop_trava_user'} > 1 ? 1 : 0;
+    return $self->opts->{'prop_last_fm_user'} ? 0 : 1;
 }
 
 sub tabindex {

Modified: trunk/htdocs/editjournal.bml
===================================================================
--- trunk/htdocs/editjournal.bml	2012-03-30 15:24:39 UTC (rev 21618)
+++ trunk/htdocs/editjournal.bml	2012-04-02 11:09:33 UTC (rev 21619)
@@ -562,7 +562,8 @@
 
             # add property for current music button displaying if last.fm user specified
             $entry->{prop_last_fm_user} = $u_for_entry->prop('last_fm_user');
-            $entry->{prop_copyright} = $entry_obj->prop('copyright') || $remote->prop('default_copyright') || 'P';
+            $entry->{prop_trava_user}   = $remote->prop('trava_uid') if $remote;
+            $entry->{prop_copyright}    = $entry_obj->prop('copyright') || $remote->prop('default_copyright') || 'P';
 
             foreach ( keys %POST ) { $entry->{$_} = %POST->{$_}; }
             $entry->{'richtext_default'} = $entry->{"prop_used_rte"} ? 1 : 0,

Tags: amyshkin, bml, livejournal, pm, zilogic
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