[Scoop-checkins] cvs commit in scoop/lib

[cvs at versionhost.com]

Commit info for scoop/lib:

Modified Files:
      Tag: CURRENT
	Scoop.pm 
Log Message:
Syncing up CURRENT with my changes to STABLE. --hulver


Index: Scoop.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop.pm,v
retrieving revision 1.127.2.1
retrieving revision 1.127.2.2
diff -r1.127.2.1 -r1.127.2.2
143a144,146
> 	# Set $S->{UI}->{MACROS}
> 	$self->_set_macros();
> 
198a202
> 	$self->_set_macros();
1008a1013,1017
> =item * $S->{UI}->{MACROS}
> 
> Same for macros; we just put them in their own section to avoid crowding
> the blocks and vars areas.
> 
1020a1030,1037
> sub _set_macros {
> 	my $S = shift;
> 
> 	my %macros = $S->get_macros();
> 	$S->{UI}->{MACROS} = \%macros;
> 
> }
> 
1578,1587c1595
< 		
< 		# Account for diaries
< 		if ($tid =~ /^diary_(\d+)$/) {
< 			my $uname = $S->get_nick($1);
< 			$topic = $S->{TOPIC_DATA}->{'diary'};
< 			$topic->{tid} = $tid;
< 			$topic->{'alttext'} = $uname."'s Diary";
< 		} else {
< 			$topic = $S->{TOPIC_DATA}->{$tid};
< 		}
---
> 		$topic = $S->{TOPIC_DATA}->{$tid};
1591,1596d1598
< 	#my @topics;
< 	#foreach my $topic (keys %{$S->{TOPIC_DATA}}) {
< 	#	push @topics, $S->{TOPIC_DATA}->{$topic};
< 	#}
< 
< 	#return \@topics;