svnno****@sourc*****
svnno****@sourc*****
2008年 4月 23日 (水) 17:34:12 JST
SRADRevision: 599
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=599
Author: tach
Date: 2008-04-23 17:34:12 +0900 (Wed, 23 Apr 2008)
Log Message:
-----------
merged from trunk
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm
slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm 2008-04-23 06:43:08 UTC (rev 598)
+++ slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm 2008-04-23 08:34:12 UTC (rev 599)
@@ -7674,7 +7674,8 @@
# of these changes, if we need to make them -- pudge
# update later in task
- delete @{$discussion}{qw(title url ts)};
+ delete @{$discussion}{qw(ts)};
+ delete @{$discussion}{qw(title url)} unless ($constants->{update_journal_story_discussion_to_story});
delete $discussion->{uid}; # leave it "owned" by poster
$id = $story->{discussion};
@@ -7843,7 +7844,8 @@
my $story = $self->getStory($stoid);
# will be updated later by journal_fix.pl
if ($story->{journal_id}) {
- delete @{$dis_data}{qw(title url ts)};
+ delete @{$dis_data}{qw(ts)};
+ delete @{$discussion}{qw(title url)} unless ($constants->{update_journal_story_discussion_to_story});
}
if (!$error) {
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-04-23 06:43:08 UTC (rev 598)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-04-23 08:34:12 UTC (rev 599)
@@ -14,8 +14,10 @@
* Fix: user karma_bonus settings are vanished...
* Fix: comment count fail when user hardthresh setting is enabled
* Remove "tid=" from story link at stories
+ * Update journal-story discussions' title/url to story title/url when vars
+ update_journal_story_discussion_to_story has been enabled.
- -- Taku YASUI <tach****@osdn*****> Wed, 16 Apr 2008 12:01:35 +0000
+ -- Taku YASUI <tach****@osdn*****> Mon, 21 Apr 2008 21:58:15 +0900
slash (2.5.0.192-8) 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-23 06:43:08 UTC (rev 598)
+++ slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-04-23 08:34:12 UTC (rev 599)
@@ -657,6 +657,7 @@
url => $url,
ts => $journal_story->{'time'}
};
+ delete @{$discussion}{qw(title url)} if ($constants->{update_journal_story_discussion_to_story});
if ($self->setDiscussion($journal_story->{discussion}, $discussion)) {
$self->sqlUpdate('journal_transfer', {
Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
===================================================================
--- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-04-23 06:43:08 UTC (rev 598)
+++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-04-23 08:34:12 UTC (rev 599)
@@ -1118,7 +1118,7 @@
INSERT INTO vars (name, value, description) VALUES ('writestatus','dirty','Simple Boolean to determine if homepage needs rewriting');
INSERT INTO vars (name, value, description) VALUES ('xhtml','0','Boolean for whether we are using XHTML');
-# add constants for OSDN Japan
+-- add constants for OSDN Japan
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_attrib_prefix','','attribute prefix for LDAP migration');
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn','','base dn for LDAP migration');
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn','','binddn for LDAP migration');
@@ -1140,6 +1140,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('no_d2','0','When "1", disable using discussion2.');
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');
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';