# HG changeset patch
# User wizard
# Date 1271857185 -14400
# Node ID 3d1f584aea608a42b394da85b936d2e459a31b6f
# Parent  0d2337e203c00b0b24621dfab2e8d61c845f61a2
small fix in the activator and secure cookie

diff -r 0d2337e203c0 -r 3d1f584aea60 Lib/IMPL/Config/Activator.pm
--- a/Lib/IMPL/Config/Activator.pm	Tue Apr 20 20:25:29 2010 +0400
+++ b/Lib/IMPL/Config/Activator.pm	Wed Apr 21 17:39:45 2010 +0400
@@ -44,7 +44,7 @@
         push @args,  map UNIVERSAL::isa($_,'IMPL::Config::Activator') ? $_->activate : $_, @_ if @_;
         
         my $factory = $this->factory;
-        eval "require $factory; 1;" unless not ref $factory and _is_class($factory);
+        eval "require $factory; 1;" unless ref $factory or _is_class($factory);
         
         return $this->object($factory->new(@args));
     } else {
diff -r 0d2337e203c0 -r 3d1f584aea60 Lib/IMPL/Web/QueryHandler/SecureCookie.pm
--- a/Lib/IMPL/Web/QueryHandler/SecureCookie.pm	Tue Apr 20 20:25:29 2010 +0400
+++ b/Lib/IMPL/Web/QueryHandler/SecureCookie.pm	Wed Apr 21 17:39:45 2010 +0400
@@ -41,9 +41,9 @@
 			)
 		) {
 			
-			my $context = $action->application->security->Session(
-				id => $sid				
-			);
+			my $context = $action->application->security->sourceSession->find(
+				{ id => $sid }
+			) or return $nextHandler->();
 			
 			my ($result,$challenge) = $context->auth->ValidateSession($cookie);