svnno****@sourc*****
svnno****@sourc*****
2008年 4月 16日 (水) 17:14:42 JST
スラドRevision: 583
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=583
Author: tach
Date: 2008-04-16 17:14:42 +0900 (Wed, 16 Apr 2008)
Log Message:
-----------
merged from trunk to 2.5.0.192 branch
Modified Paths:
--------------
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-04-16 07:33:52 UTC (rev 582)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-04-16 08:14:42 UTC (rev 583)
@@ -4,8 +4,10 @@
at tagboxes
* Fix Prototype mismatch: sub main::EOF: none vs () at
/var/lib/slash/site/slashdot.jp/tasks/zoo_run_people_log.pl
+ * Allow to show AC info for admin user
+ * Fix: user karma_bonus settings are vanished...
- -- Taku YASUI <tach****@osdn*****> Mon, 31 Mar 2008 12:07:49 +0000
+ -- Taku YASUI <tach****@osdn*****> Wed, 16 Apr 2008 07:32:44 +0000
slash (2.5.0.192-8) unstable; urgency=low
Modified: slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl
===================================================================
--- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl 2008-04-16 07:33:52 UTC (rev 582)
+++ slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl 2008-04-16 08:14:42 UTC (rev 583)
@@ -1060,7 +1060,7 @@
}
# Can't get user data for the anonymous user.
- if ($fieldkey eq 'uid' && isAnon($uid)) {
+ if (!$user->{is_admin} && $fieldkey eq 'uid' && isAnon($uid)) {
header(getMessage('user_header')) or return;
return displayForm();
}
@@ -2189,6 +2189,7 @@
60, 65, 70, 75, 80, 85, 90, 95 )],
$user_edit->{new_user_percent} || 100, 1, 1);
# Karma modifier
+ $user_edit->{karma_bonus} = '+1' unless (defined($user_edit->{karma_bonus}));
my $karma_bonus = createSelect('karma_bonus', \@range,
$user_edit->{karma_bonus} || 0, 1, 1);
# Subscriber modifier