[Slashdotjp-dev 1249] [777] Fix journal preview to use new theme system

アーカイブの一覧に戻る

svnno****@sourc***** svnno****@sourc*****
2008年 10月 1日 (水) 16:26:16 JST


Revision: 777
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=777
Author:   tach
Date:     2008-10-01 16:26:16 +0900 (Wed, 01 Oct 2008)

Log Message:
-----------
Fix journal preview to use new theme system

Modified Paths:
--------------
    slashjp/branches/2.5.0.192/debian/changelog
    slashjp/branches/2.5.0.192/plugins/Journal/journal.pl


-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog	2008-09-30 06:23:58 UTC (rev 776)
+++ slashjp/branches/2.5.0.192/debian/changelog	2008-10-01 07:26:16 UTC (rev 777)
@@ -1,8 +1,9 @@
 slash (2.5.0.192-20) unstable; urgency=low
 
   * Back to default only 'slashboxes' when 'restore_default_slashbox'
+  * Fix journal preview to use new theme system
 
- -- Taku YASUI <tach****@osdn*****>  Tue, 30 Sep 2008 06:22:58 +0000
+ -- Taku YASUI <tach****@osdn*****>  Wed,  1 Oct 2008 07:25:38 +0000
 
 slash (2.5.0.192-19) unstable; urgency=low
 

Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl	2008-09-30 06:23:58 UTC (rev 776)
+++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl	2008-10-01 07:26:16 UTC (rev 777)
@@ -832,8 +832,16 @@
 		};
 
 		my $theme = _checkTheme($user->{'journal_theme'});
+		my $theme_type = $journal_reader->getThemeType($theme);
+		if ($user->{mobile}) {
+			$theme = 'mobile';
+			$theme_type = 'mobile';
+		}
+
 		my $zoo   = getObject('Slash::Zoo');
-		slashDisplay($theme, {
+		slashDisplay("theme_$theme_type", {
+			preview		=> 1,
+			theme		=> $theme,
 			articles	=> [{ day => $article->{date}, article => [ $disp_article ] }],
 			uid		=> $article->{uid} || $user->{uid},
 			is_friend	=> $zoo->isFriend($user->{uid}, $article->{uid}),


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