Commit info for scoop/lib/Scoop/Admin:
Modified Files:
AdminStories.pm PostThrottle.pm
Log Message:
Missed a couple of files out, which I put in CURRENT, but missed from stable. This just tidies everything up.
--hulver.
Index: AdminStories.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/AdminStories.pm,v
retrieving revision 1.136
retrieving revision 1.137
diff -r1.136 -r1.137
526,535d525
< # Check for diary and set tid if so.
< if ($parms->{'section'} eq 'Diary') {
< if ($parms->{tid} && $S->have_perm('story_admin')) {
< $params{'tid'} = $parms->{tid};
< } else {
< $parms->{tid} = 'diary_'.$S->{UID};
< $params{'tid'} = $parms->{tid};
< }
< }
<
981,987c971,981
< if ($S->have_perm('story_admin') && $sid) {
< warn "SID is $sid\n" if $DEBUG;
< my $stories = $S->getstories({'-type' => 'fullstory', '-perm_override' => 1, '-sid' => $sid});
< my $story = $stories->[0];
< if ($story->{tid} && $story->{section} eq 'Diary') {
< warn "Topic is $story->{tid}\n";
< return qq|<INPUT TYPE="hidden" NAME="tid" VALUE="$tid"><B>[ $story->{tid} ]</B>|;
---
> if (!$S->{UI}->{VARS}->{diary_topics}) {
> if ($S->have_perm('story_admin') && $sid) {
> warn "SID is $sid\n" if $DEBUG;
> my $stories = $S->getstories({'-type' => 'fullstory', '-perm_override' => 1, '-sid' => $sid});
> my $story = $stories->[0];
> if ($story->{tid} && $story->{section} eq 'Diary') {
> warn "Topic is $story->{tid}\n";
> return qq|<INPUT TYPE="hidden" NAME="tid" VALUE="$tid"><B>[ $story->{tid} ]</B>|;
> }
> } elsif ($section eq 'Diary') {
> return qq|<INPUT TYPE="hidden" NAME="tid" VALUE="diary"><B>[ $S->{NICK} ]</B>|;
989,990d982
< } elsif ($section eq 'Diary') {
< return qq|<B>[ $S->{NICK} ]</B>|;
1003c995
< next if ($topic->{tid} eq 'diary');
---
> next if (($topic->{tid} eq 'diary') && (!$S->{UI}->{VARS}->{diary_topics}));
1005c997
< if ($topic->{tid} eq $tid) {
---
> if (($topic->{tid} eq $tid) || (($tid eq '') && ($topic->{tid} eq 'diary') && ($section eq 'Diary'))) {
Index: PostThrottle.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/PostThrottle.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -r1.8 -r1.9
10a11
> return if ($S->{GID} eq 'Superuser');