absolutedir doesn't have a trailing slash either; plus whitespace fixes

scc · Apr 8, 2003 · 4808c50 · 4808c50
1 parent 8ccec98
commit 4808c50
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/plugins/Journal/journal.pl b/plugins/Journal/journal.pl
@@ -17,7 +17,7 @@
 sub main {
 	my $journal   = getObject('Slash::Journal');
 	my $constants = getCurrentStatic();
-	my $reader = getObject('Slash::DB', { db_type => 'reader' });
+	my $reader    = getObject('Slash::DB', { db_type => 'reader' });
 	my $user      = getCurrentUser();
 	my $form      = getCurrentForm();
 
@@ -375,7 +375,7 @@ sub displayArticle {
 	unless ($articles && @$articles) {
 		print getData('noentries_found');
 		if ($user_change && %$user_change) {
-			my $slashdb   = getCurrentDB();
+			my $slashdb = getCurrentDB();
 			$slashdb->setUser($user->{uid}, $user_change);
 		}
 		return;
@@ -454,7 +454,7 @@ sub displayArticle {
 	}
 
 	if ($user_change && %$user_change) {
-		my $slashdb   = getCurrentDB();
+		my $slashdb = getCurrentDB();
 		$slashdb->setUser($user->{uid}, $user_change);
 	}
 }
@@ -486,7 +486,7 @@ sub setPrefs {
 		_checkTheme($form->{journal_theme})
 		if defined $form->{journal_theme};
 
-	my $slashdb   = getCurrentDB();
+	my $slashdb = getCurrentDB();
 	$slashdb->setUser($user->{uid}, \%prefs);
 
 	editPrefs(@_);
@@ -542,7 +542,7 @@ sub saveArticle {
 
 	return 0 unless _validFormkey($ws ? qw(max_post_check interval_check) : ());
 
-	my $slashdb   = getCurrentDB();
+	my $slashdb = getCurrentDB();
 	if ($form->{id}) {
 
 		my %update;
@@ -674,7 +674,7 @@ sub editArticle {
 	} else {
 		$article  = $journal->get($form->{id}) if $form->{id};
 		$posttype = $article->{posttype};
-		my $slashdb   = getCurrentDB();
+		my $slashdb = getCurrentDB();
 		$slashdb->createFormkey('journal');
 	}
 

diff --git a/plugins/Search/search.pl b/plugins/Search/search.pl
@@ -338,7 +338,7 @@ sub pollSearch {
 	slashDisplay('searchform', {
 		op		=> $form->{op},
 		topics		=> _topics(),
-		sections	 => _sections(),
+		sections	=> _sections(),
 		tref		=> $slashdb->getTopic($form->{tid}),
 		'sort'		=> _sort(),
 	});
@@ -491,10 +491,10 @@ sub pollSearchRSS {
 	for my $entry (@$stories) {
 		my $time = timeCalc($entry->{date});
 		my $url = $slashdb->getSection($entry->{section}, 'url');
-		my $link = $url ? $url . '/' : $constants->{absolutedir};
+		my $link = $url || $constants->{absolutedir};
 		push @items, {
 			title	=> "$entry->{question} ($time)",
-			'link'	=> ($url . 'pollBooth.pl?qid=' . $entry->{qid}),
+			'link'	=> ($link . '/pollBooth.pl?qid=' . $entry->{qid}),
 		};
 	}