svnno****@sourc*****
svnno****@sourc*****
2008年 2月 7日 (木) 19:30:23 JST
SRADRevision: 492
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=492
Author: tach
Date: 2008-02-07 19:30:23 +0900 (Thu, 07 Feb 2008)
Log Message:
-----------
Fix: delete discussion when another stories have same discussion
Modified Paths:
--------------
slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm
slashjp/trunk/debian/changelog
-------------- next part --------------
Modified: slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm
===================================================================
--- slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm 2008-02-04 13:39:26 UTC (rev 491)
+++ slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm 2008-02-07 10:30:23 UTC (rev 492)
@@ -1328,6 +1328,9 @@
$self->sqlUpdate('journal_transfer', {
stoid => 0,
}, 'id=' . $self->sqlQuote($story->{journal_id}));
+ } elsif ($discussion_id &&
+ $self->sqlCount('stories', "discussion=$discussion_id") > 0) {
+ # do nothing
} elsif ($discussion_id) {
$self->deleteDiscussion($discussion_id);
}
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2008-02-04 13:39:26 UTC (rev 491)
+++ slashjp/trunk/debian/changelog 2008-02-07 10:30:23 UTC (rev 492)
@@ -5,8 +5,9 @@
* Fix logchack ignore rules:
- Change case of string
- Suppress Delete neverdisplay stories from story_dirty message
+ * Fix: delete discussion when another stories have same discussion
- -- Taku YASUI <tach****@osdn*****> Mon, 04 Feb 2008 22:38:45 +0900
+ -- Taku YASUI <tach****@osdn*****> Wed, 06 Feb 2008 18:17:55 +0900
slash (2.5.0.189-3) unstable; urgency=low