Tupshin Harper (tupshin) wrote in changelog,
Tupshin Harper
tupshin
changelog

[livejournal] r15606: Resolved conflict from merging 15604

Committer: tupshin
Resolved conflict from merging 15604

U   branches/r52.2/htdocs/directory.bml
U   branches/r52.2/htdocs/interests.bml
Modified: branches/r52.2/htdocs/directory.bml
===================================================================
--- branches/r52.2/htdocs/directory.bml	2009-08-14 12:23:00 UTC (rev 15605)
+++ branches/r52.2/htdocs/directory.bml	2009-08-14 12:25:04 UTC (rev 15606)
@@ -193,7 +193,9 @@
             <a href="$url"><< $ML{'.new_search'}</a>
         </div>
     };
-    $ret .= "<p class=\"b-message b-message-suggestion\" style=\"margin-right:330px;\"><a href=\"$LJ::SITEROOT/search/\">$ML{'.newsearch.link'}</a></p>";	
+    $ret .= qq{
+            <p class="b-message b-message-suggestion"><a href="$LJ::SITEROOT/search/">$ML{'.newsearch.link'}</a></p>
+    } unless $LJ::DISABLED{'yandex_search'};
 
     $ret .= qq {
         <?h1 $ML{'.search_results'} h1?>

Modified: branches/r52.2/htdocs/interests.bml
===================================================================
--- branches/r52.2/htdocs/interests.bml	2009-08-14 12:23:00 UTC (rev 15605)
+++ branches/r52.2/htdocs/interests.bml	2009-08-14 12:25:04 UTC (rev 15606)
@@ -394,7 +394,7 @@
 
         my $ret = '';
 
-	    $ret .= qq{<p class="b-message b-message-suggestion" style="margin-right:330px;"><a href="$LJ::SITEROOT/search/">$ML{'.newsearch.link'}</a></p>"}
+	    $ret .= qq{<p class="b-message b-message-suggestion" style="margin-right:330px;"><a href="$LJ::SITEROOT/search/">$ML{'.newsearch.link'}</a></p>} 
 	        unless $LJ::DISABLED{'yandex_search'};
         $ret .= "<table>";
         $ret .= "<tr valign='middle'><td class='findandmodify'>$ML{'.interested.in'}</td>";
@@ -530,7 +530,8 @@
     }
 
     my $ret = "";
-    $ret .= "<p class=\"b-message b-message-suggestion\" style=\"margin-right:330px;\"><a href=\"$LJ::SITEROOT/search/\">$ML{'.newsearch.link'}</a></p>";
+    $ret .= qq{<p class="b-message b-message-suggestion" style="margin-right:330px;"><a href="$LJ::SITEROOT/search/">$ML{'.newsearch.link'}</a></p>} 
+        unless $LJ::DISABLED{'yandex_search'};
     $ret .= "<?p $ML{'.interests.text'} p?>";
     $ret .= "<table cellspacing='5' style='margin-top: 10px; margin-left: 30px; margin-bottom: 10px;'>";
 

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