svnno****@sourc*****
svnno****@sourc*****
2009年 2月 26日 (木) 19:22:50 JST
SRADRevision: 1043
http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1043
Author: tach
Date: 2009-02-26 19:22:50 +0900 (Thu, 26 Feb 2009)
Log Message:
-----------
* Add variable "messages_send_journal_story_comments" to select sending
messages for "journal-story" comments
Fix: http://sourceforge.jp/ticket/browse.php?group_id=4&tid=15038 (#15038)
Ticket Links:
:-----------
http://sourceforge.jp/projects/slashdotjp/tracker/detail/15038
Modified Paths:
--------------
slashjp/trunk/Slash/Utility/Comments/Comments.pm
slashjp/trunk/debian/changelog
slashjp/trunk/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm
===================================================================
--- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-24 08:50:43 UTC (rev 1042)
+++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-26 10:22:50 UTC (rev 1043)
@@ -1747,7 +1747,7 @@
}
# reply to journal
- if ($messages && $kinds->{ $discussion->{dkid} } =~ /^journal/) {
+ if ($messages && ($kinds->{ $discussion->{dkid} } eq "journal" || $kinds->{ $discussion->{dkid} } =~ /^journal/ && $constants->{messages_send_journal_story_comments})) {
my $users = $messages->checkMessageCodes(MSG_CODE_JOURNAL_REPLY, [$discussion->{uid}]);
if (_send_comment_msg($users->[0], \%users, $pts, $clean_comment)) {
my $data = {
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2009-02-24 08:50:43 UTC (rev 1042)
+++ slashjp/trunk/debian/changelog 2009-02-26 10:22:50 UTC (rev 1043)
@@ -24,8 +24,10 @@
* Fix poll discussion kind definition
* Add fix-poll-discussions - fix discussions.dkid for poll discussion item
* Disable discussion2 when mobile mode
+ * Add variable "messages_send_journal_story_comments" to select sending
+ messages for "journal-story" comments
- -- Taku YASUI <tach****@osdn*****> Mon, 23 Feb 2009 13:13:34 +0000
+ -- Taku YASUI <tach****@osdn*****> Thu, 26 Feb 2009 10:21:37 +0000
slash (2.5.0.233-4) unstable; urgency=low
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2009-02-24 08:50:43 UTC (rev 1042)
+++ slashjp/trunk/sql/mysql/defaults.sql 2009-02-26 10:22:50 UTC (rev 1043)
@@ -1165,6 +1165,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('d2_default', '', 'Default discussion2 module name');
INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_tagged_by_uid', '0', 'Use as tagged_by_uid instead of uid for FireHose filter "user:username"');
INSERT IGNORE INTO vars (name, value, description) VALUES ('submission_remove_mainpage_nexus_tid', '0', 'Remove "Index" topic on topic list at story editing from submission');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('messages_send_journal_story_comments', '0', 'Send "MSG_CODE_JOURNAL_REPLY" messages when the discussion is "journal-story"');
UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage';
UPDATE vars SET value='0' WHERE name='draconian_charset';
UPDATE vars SET value='UTF-8' WHERE name='rdfencoding';