[livejournal] r19756: LJSUP-8857: Updating commenting form

LJSUP-8857: Updating commenting form

U   trunk/cgi-bin/LJ/Talk.pm

Modified: trunk/cgi-bin/LJ/Talk.pm
===================================================================
--- trunk/cgi-bin/LJ/Talk.pm	2011-08-17 08:42:22 UTC (rev 19755)
+++ trunk/cgi-bin/LJ/Talk.pm	2011-08-17 08:43:43 UTC (rev 19756)
@@ -1970,7 +1970,7 @@
         'journalu_username'      => $journalu->username,
         'editid'                 => $editid,
         'entry_url'              => $entry->url,
-        'nocomments'             => $entry->prop('opt_nocomments'),
+        'nocomments'             => $entry->prop('opt_nocomments') || ( $journalu ? $journalu->{opt_showtalklinks} : 0),
         'suspended'              => $remote ? $remote->is_suspended : 0,
         'deleted'                => $remote ? $remote->is_deleted || $remote->is_expunged : 0,
         'will_be_screened'       => $entry->prop('opt_screening'),