alf (red_alf) wrote in changelog,
alf
red_alf
changelog

[livejournal] r20662: LJSUP-10508: Commenting form S1 (Lebedev...

Committer: afedorov
LJSUP-10508: Commenting form S1 (Lebedev's redesign). Move branch to trunk
U   trunk/htdocs/talkpost_do.bml
Modified: trunk/htdocs/talkpost_do.bml
===================================================================
--- trunk/htdocs/talkpost_do.bml	2011-11-30 09:38:26 UTC (rev 20661)
+++ trunk/htdocs/talkpost_do.bml	2011-11-30 11:17:59 UTC (rev 20662)
@@ -311,28 +311,9 @@
             return LJ::Talk::talkform_mobile($talkform_opts)
                 if $POST{'mobile_domain'} =~ qr/^\w\.$LJ::DOMAIN$/;
 
-<<<<<<< .working
-
             if ( $use_s1 and not $external_site_case and LJ::is_enabled('new_comments') ) {
                 return LJ::Widget::Form->render_body(
                     entry        => $entry,
-                    standalone   => 1,
-                    stylemine    => $GET{'style'} eq 'mine'? 1 : 0,
-                    replyto      => $talkform_opts->{'replyto'},
-                    editid       => $editid,
-                    form         => \%POST,
-                    parpost      => $parpost,
-                    errors       => [ map { error => $_ }, @errors ],
-                    parenttalkid => $talkform_opts->{'replyto'}, #ref $parpost eq 'HASH'? $init->{'ditemid'} : 0,
-                );
-            } else {
-                return LJ::Talk::talkform($talkform_opts);
-            }
-=======
-
-            if ( $use_s1 and not $external_site_case and LJ::is_enabled('new_comments') ) {
-                return LJ::Widget::Form->render_body(
-                    entry        => $entry,
                     standalone   => 2,
                     stylemine    => $GET{'style'} eq 'mine'? 1 : 0,
                     replyto      => $talkform_opts->{'replyto'},
@@ -345,7 +326,6 @@
             } else {
                 return LJ::Talk::talkform($talkform_opts);
             }
->>>>>>> .merge-right.r20657
         }
 
         # checked $POST{agree_tos} was checked above if it was necessary,

Tags: afedorov, bml, livejournal, red_alf
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