svnno****@sourc*****
svnno****@sourc*****
2007年 10月 16日 (火) 12:05:01 JST
SRADRevision: 186
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=186
Author: tach
Date: 2007-10-16 12:05:00 +0900 (Tue, 16 Oct 2007)
Log Message:
-----------
fix default maxstories value (but user defined value has not been used yet)
Modified Paths:
--------------
slashjp/trunk/themes/slashcode/htdocs/users.pl
-------------- next part --------------
Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl
===================================================================
--- slashjp/trunk/themes/slashcode/htdocs/users.pl 2007-10-15 11:10:51 UTC (rev 185)
+++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2007-10-16 03:05:00 UTC (rev 186)
@@ -2759,6 +2759,7 @@
my $user = getCurrentUser();
my $form = getCurrentForm();
my $constants = getCurrentStatic();
+ my $gSkin = getCurrentSkin();
my($uid, $error);
if ($user->{is_admin}) {
@@ -2927,7 +2928,7 @@
slashboxes => checkList($slashboxes, 1024),
- maxstories => (($form->{maxstories} > 0 && $form->{maxstories} <= 90) ? $form->{maxstories} : 30),
+ maxstories => (($form->{maxstories} > 0 && $form->{maxstories} <= 90) ? $form->{maxstories} : ($gSkin->{artcount_max} || 30)),
noboxes => ($form->{useslashboxes} ? 0 : 1),
lowbandwidth => ($form->{lowbandwidth} ? 1 : 0),
simpledesign => ($form->{simpledesign} ? 1 : 0),
@@ -2981,8 +2982,8 @@
getOtherUserParams($user_edits_table);
if ($form->{restore_defaults}) {
setToDefaults($user_edits_table, {}, {
- maxstories => 30,
- tzcode => "EST",
+ maxstories => $gSkin->{artcount_max} || 30,
+ tzcode => "JST",
# XXX shouldn't this reset ALL the defaults,
# not just these two?
});