[Slashdotjp-dev 944] [463] * Revert previous fix of Slash/Utility/Display/Display.pm

アーカイブの一覧に戻る

svnno****@sourc***** svnno****@sourc*****
2008年 1月 24日 (木) 20:05:33 JST


Revision: 463
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=463
Author:   tach
Date:     2008-01-24 20:05:33 +0900 (Thu, 24 Jan 2008)

Log Message:
-----------
 * Revert previous fix of Slash/Utility/Display/Display.pm
 * Add to check if the story exists

Modified Paths:
--------------
    slashjp/trunk/Slash/DB/MySQL/MySQL.pm
    slashjp/trunk/Slash/Utility/Display/Display.pm
    slashjp/trunk/debian/changelog


-------------- next part --------------
Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm
===================================================================
--- slashjp/trunk/Slash/DB/MySQL/MySQL.pm	2008-01-24 09:16:41 UTC (rev 462)
+++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm	2008-01-24 11:05:33 UTC (rev 463)
@@ -12150,6 +12150,7 @@
 	my $stoids_hr = _addGlobjEssentials_getids($ar, 'stories');
 	my @stoids = keys %$stoids_hr;
 	for my $stoid (@stoids) {
+		next unless ($self->sqlSelect('stoid','stories',"stoid=$stoid"));
 		my $globjid = $stoids_hr->{$stoid};
 		my $story = $self->getStory($stoid);
 		my $data_ar = linkStory({ stoid => $stoid });

Modified: slashjp/trunk/Slash/Utility/Display/Display.pm
===================================================================
--- slashjp/trunk/Slash/Utility/Display/Display.pm	2008-01-24 09:16:41 UTC (rev 462)
+++ slashjp/trunk/Slash/Utility/Display/Display.pm	2008-01-24 11:05:33 UTC (rev 463)
@@ -545,9 +545,8 @@
 		# but we would need to `mv articles mainpage`, or ln -s, and it just seems better
 		# to me to keep the same URL scheme if possible
 		my $skinname = $skin->{name} eq 'mainpage' ? 'articles' : $skin->{name};
-		my $sid = defined($story_link->{sid}) ? $story_link->{sid} : $story_ref->{sid};
 		$url .= "/$skinname" unless ($url =~ /\/${skinname}$/);
-		$url .= "/" . $sid . ".shtml";
+		$url .= "/" . ($story_link->{sid} || $story_ref->{sid}) . ".shtml";
 		# manually add the tid(s), if wanted
 		if ($constants->{tids_in_urls} && $params{tids}) {
 			$url .= '?';

Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog	2008-01-24 09:16:41 UTC (rev 462)
+++ slashjp/trunk/debian/changelog	2008-01-24 11:05:33 UTC (rev 463)
@@ -6,7 +6,7 @@
   * Fix: Use of uninitialized value at
     /usr/lib/perl5/Slash/Utility/Display.pm line 549.
 
- -- Taku YASUI <tach****@osdn*****>  Thu, 24 Jan 2008 12:44:30 +0900
+ -- Taku YASUI <tach****@osdn*****>  Thu, 24 Jan 2008 19:58:59 +0900
 
 slash (2.5.0.189-2) unstable; urgency=low
 


Slashdotjp-dev メーリングリストの案内
アーカイブの一覧に戻る