svnno****@sourc*****
svnno****@sourc*****
2008年 4月 24日 (木) 17:15:54 JST
SRADRevision: 603
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=603
Author: tach
Date: 2008-04-24 17:15:54 +0900 (Thu, 24 Apr 2008)
Log Message:
-----------
Fix to create/update firehose item from Journal correctly
Modified Paths:
--------------
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-04-24 04:04:26 UTC (rev 602)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-04-24 08:15:54 UTC (rev 603)
@@ -4,8 +4,9 @@
* Update journal-story discussions' title/url to story title/url when vars
update_journal_story_discussion_to_story has been enabled.
* Fix not to show contents when the skin does not exist
+ * Fix to create/update firehose item from Journal correctly
- -- Taku YASUI <tach****@osdn*****> Thu, 24 Apr 2008 13:00:34 +0900
+ -- Taku YASUI <tach****@osdn*****> Thu, 24 Apr 2008 17:15:12 +0900
slash (2.5.0.192-9) unstable; urgency=low
Modified: slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-04-24 04:04:26 UTC (rev 602)
+++ slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-04-24 08:15:54 UTC (rev 603)
@@ -60,14 +60,10 @@
$self->sqlUpdate('journals', \%j1, "id=$id") if keys %j1;
$self->sqlUpdate('journals_text', \%j2, "id=$id") if $j2{article};
if ($constants->{plugin}{FireHose}) {
- my $reskey = getObject('Slash::ResKey');
- my $rkey = $reskey->key('submit', { nostate => 1 });
- if ($rkey && $rkey->createuse) {
- my $journal_item = $self->get($id);
- my $firehose = getObject("Slash::FireHose");
- if ($journal_item->{promotetype} eq "publicize" || $journal_item->{promotetype} eq "publish") {
- $firehose->createUpdateItemFromJournal($id);
- }
+ my $journal_item = $self->get($id);
+ my $firehose = getObject("Slash::FireHose");
+ if ($journal_item->{promotetype} eq "publicize" || $journal_item->{promotetype} eq "publish") {
+ $firehose->createUpdateItemFromJournal($id);
}
}
}
@@ -215,15 +211,11 @@
my $slashdb = getCurrentDB();
$slashdb->setUser($user->{uid}, { journal_last_entry_date => $date });
if ($constants->{plugin}{FireHose}) {
- my $reskey = getObject('Slash::ResKey');
- my $rkey = $reskey->key('submit', { nostate => 1 });
- if ($rkey && $rkey->createuse) {
- my $firehose = getObject("Slash::FireHose");
- my $journal = getObject("Slash::Journal");
- my $j = $journal->get($id);
- if ($j->{promotetype} eq "publicize" || $j->{promotetype} eq "publish") {
- $firehose->createItemFromJournal($id);
- }
+ my $firehose = getObject("Slash::FireHose");
+ my $journal = getObject("Slash::Journal");
+ my $j = $journal->get($id);
+ if ($j->{promotetype} eq "publicize" || $j->{promotetype} eq "publish") {
+ $firehose->createItemFromJournal($id);
}
}