[Scoop-checkins] cvs commit in scoop/lib/Scoop

[cvs at versionhost.com]

Commit info for scoop/lib/Scoop:

Modified Files:
      Tag: CURRENT
	Cron.pm Interface.pm 
Added Files:
      Tag: CURRENT
	Macros.pm 
Log Message:
Syncing up CURRENT with my changes to STABLE. --hulver



Index: Cron.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Cron.pm,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -r1.23 -r1.23.2.1
831c831
< 		my $ret = $S->mail($user->{email}, $S->{UI}->{VARS}->{digest_subject}, $mail);
---
> 		my $ret = $S->mail($user->{email}, $S->{UI}->{BLOCKS}->{digest_subject}, $mail);

Index: Interface.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Interface.pm,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -r1.54 -r1.54.2.1
90a91,121
> sub get_macros {
> # cloned from get_vars above.
> 
> 	my $S = shift;
> 	my $time = time();
> 	
> 	if (my $cached = $S->cache->fetch_data({resource => 'macros', 
> 	                                        element => 'MACROS'})) {
> 		return %{$cached};
> 	}
> 
> 	my ($rv, $sth) = $S->db_select({
> 		WHAT => '*',
> 		FROM => 'macros'});
> 	
> 	my $macros;
> 	if ($rv) {
> 		while (my $macro_record = $sth->fetchrow_hashref) {
> 			$macros->{$macro_record->{name}} = $macro_record->{value};
> 		}
> 	}
> 	$sth->finish();
> 
> 	$S->cache->cache_data({resource => 'macros', 
> 	                       element => 'MACROS', 
> 	                       data => $macros});
> 	
> 	# Return value, not reference so that our changes won't infect the global cache
> 	return %{$macros};
> }
>