svnno****@sourc*****
svnno****@sourc*****
2008年 4月 23日 (水) 17:38:57 JST
Revision: 601 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=601 Author: tach Date: 2008-04-23 17:38:57 +0900 (Wed, 23 Apr 2008) Log Message: ----------- merged from branches/2.5.0.192 * Fix to take discussion id from journal-submission Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2008-04-23 08:35:08 UTC (rev 600) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2008-04-23 08:38:57 UTC (rev 601) @@ -1258,7 +1258,7 @@ my $firehose_id = $firehose->createItemFromSubmission($subid); if ($firehose_id) { - my $discussion_id = $self->createDiscussion({ + my $discussion_id = $submission->{discussion} || $self->createDiscussion({ uid => 0, kind => 'submission', title => $data->{subj},