svnno****@sourc*****
svnno****@sourc*****
2008年 4月 24日 (木) 18:37:40 JST
SRADRevision: 605
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=605
Author: tach
Date: 2008-04-24 18:37:40 +0900 (Thu, 24 Apr 2008)
Log Message:
-----------
* Add to enable/disable to show publicized(story-submitted) journals to
firehose as journal firehose item
- Using "update_journal_story_discussion_to_story" variable
Modified Paths:
--------------
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/FireHose/FireHose.pm
slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-04-24 09:10:56 UTC (rev 604)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-04-24 09:37:40 UTC (rev 605)
@@ -8,8 +8,11 @@
- Do not use "submit" reskey
* Fix to update story-submitted journal correctly
- Do not use "submit" reskey
+ * Add to enable/disable to show publicized(story-submitted) journals to
+ firehose as journal firehose item
+ - Using "update_journal_story_discussion_to_story" variable
- -- Taku YASUI <tach****@osdn*****> Thu, 24 Apr 2008 18:08:44 +0900
+ -- Taku YASUI <tach****@osdn*****> Thu, 24 Apr 2008 18:36:57 +0900
slash (2.5.0.192-9) unstable; urgency=low
Modified: slashjp/branches/2.5.0.192/plugins/FireHose/FireHose.pm
===================================================================
--- slashjp/branches/2.5.0.192/plugins/FireHose/FireHose.pm 2008-04-24 09:10:56 UTC (rev 604)
+++ slashjp/branches/2.5.0.192/plugins/FireHose/FireHose.pm 2008-04-24 09:37:40 UTC (rev 605)
@@ -109,7 +109,7 @@
discussion => $journal->{discussion},
word_count => countWords($introtext)
});
-
+ $self->setFireHose($itemid, { public => "no" }) if (getCurrentStatic("firehose_disable_to_show_publicized_journals") && $journal->{promotetype} eq "publicize");
} else {
$self->createItemFromJournal($id);
}
Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
===================================================================
--- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-04-24 09:10:56 UTC (rev 604)
+++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-04-24 09:37:40 UTC (rev 605)
@@ -1141,6 +1141,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_name','Firehose','The name of "Firehose" function');
INSERT IGNORE INTO vars (name, value, description) VALUES ('rss_use_story_shtml','0','Use ${sid}.shtml for RSS/RDF link');
INSERT IGNORE INTO vars (name, value, description) VALUES ('update_journal_story_discussion_to_story','0','Update discussion of journal-story title/url to story title/url');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_disable_to_show_publicized_journals','1','Do not show publicized(story-submitted) journals as firehose item');
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';