Browse files

Updates, journal RSS fixes

  • Loading branch information...
1 parent 2b50e94 commit 822f1ed78ae8eaf6126f0844b6139a01cb0c698a @pudge pudge committed Nov 11, 2004
Showing with 11 additions and 9 deletions.
  1. +5 −1 Slash/Apache/User/User.pm
  2. +4 −4 plugins/Journal/journal.pl
  3. +2 −4 sql/mysql/upgrades
View
6 Slash/Apache/User/User.pm
@@ -222,7 +222,11 @@ sub handler {
# only allow this for certain pages/ops etc.
# and that page must doublecheck for permissions etc., still,
# redirecting user back to a main page upon failure
- if ($constants->{rss_allow_index} && $form->{content_type} eq 'rss' && $uri =~ m{^/index\.pl$}) {
+ if (
+ ($constants->{rss_allow_index} && $form->{content_type} eq 'rss' && $uri =~ m{^/index\.pl$})
+ ||
+ ($constants->{journal_rdfitemdesc_html} && $form->{content_type} eq 'rss' && $uri =~ m{^/journal\.pl$})
+ ) {
$logtoken = $form->{logtoken};
} else {
delete $form->{logtoken};
View
8 plugins/Journal/journal.pl
@@ -205,9 +205,9 @@ sub searchUsers {
sub displayRSS {
my($journal, $constants, $user, $form, $reader, $gSkin) = @_;
- $user = $reader->getUser($form->{uid}, ['nickname', 'fakeemail']) if $form->{uid};
+ my $juser = $form->{uid} ? $reader->getUser($form->{uid}, ['nickname', 'fakeemail']) : $user;
my $uid = $form->{uid} || $user->{uid};
- my $nickname = $user->{nickname};
+ my $nickname = $juser->{nickname};
my $tree = $reader->getTopicTree;
my $articles = $journal->getsByUid($uid, 0, 15);
@@ -226,7 +226,7 @@ sub displayRSS {
};
}
- $usertext .= " <$user->{fakeemail}>" if $user->{fakeemail};
+ $usertext .= " <$juser->{fakeemail}>" if $juser->{fakeemail};
my $rss_html = $constants->{journal_rdfitemdesc_html} && (
$user->{is_admin}
@@ -238,7 +238,7 @@ sub displayRSS {
xmlDisplay(rss => {
channel => {
- title => "$constants->{sitename} Journals",
+ title => "${nickname}'s $constants->{sitename} Journal",
description => "${nickname}'s Journal",
'link' => "$gSkin->{absolutedir}/~" . fixparam($nickname) . "/journal/",
creator => $usertext,
View
6 sql/mysql/upgrades
@@ -2702,10 +2702,6 @@ INSERT INTO vars (name, value, description) VALUES ('ircslash_remarks_max_year',
ALTER TABLE users_info ADD INDEX tokens (tokens);
ALTER TABLE users_comments ADD INDEX points (points);
-# SLASHCODE/USEPERL LAST UPDATED HERE
-
-# SLASHDOT LAST UPDATED HERE
-
# End of T_2_5_0_35, Start of T_2_5_0_36 - 2004/11/03
### DEFINE THESE!!
@@ -2724,4 +2720,6 @@ ALTER TABLE pollquestions CHANGE COLUMN discussion discussion mediumint UNSIGNED
# SLASHCODE/USEPERL LAST UPDATED HERE
+# SLASHDOT LAST UPDATED HERE
+
# End of T_2_5_0_36, Start of T_2_5_0_37 - 2004/11/08

0 comments on commit 822f1ed

Please sign in to comment.