[livejournal] r21530: LJSUP-11421: Cliend-side development for...

U   trunk/cgi-bin/LJ/Widget/EntryForm.pm

Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-03-23 08:11:59 UTC (rev 21529)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-03-23 08:29:08 UTC (rev 21530)
@@ -1158,7 +1158,7 @@
                 $self->lastfm_geolocation_width,
             });
 
-            #if ( $self->should_show_trava ) {
+            if ( $self->should_show_trava ) {
                 my $trava_uid    = LJ::ejs($opts->{'prop_trava_user'});
                 my $button_label = ml('entryform.music.search');
                 my $help_icon    = LJ::help_icon_html("trava", "", " ");
@@ -1185,8 +1185,8 @@
                 #}
 
 
-            #}
-            #elsif ( $self->should_show_lastfm ) {
+            }
+            elsif ( $self->should_show_lastfm ) {
                 my $last_fm_user = LJ::ejs($opts->{'prop_last_fm_user'});
                 my $button_label = ml('entryform.music.detect');
                 my $help_icon = LJ::help_icon_html("lastfm", "", " ");
@@ -1207,7 +1207,7 @@
                         lastfm_current('$last_fm_user', false);
                     });
                 }
-            #}
+            }
 
             $out .= "</span>\n";
 
@@ -1730,6 +1730,7 @@
     my ($moodlist, $moodpics);
 
     LJ::need_string( qw(
+        /music.settings.search
         /update.bml.msg.newalbums
         /update.bml.msg.newalbums.organise
     ) );