[Socialtext-commits] SF.net SVN: socialtext: [1002] branches/rug/lib/Socialtext/Apache/User.pm

[<pet...@us...>]

Revision: 1002
          http://svn.sourceforge.net/socialtext/?rev=1002&view=rev
Author:   petdance
Date:     2007-01-30 14:32:07 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
bake and fetch must have $r passed in

Modified Paths:
--------------
    branches/rug/lib/Socialtext/Apache/User.pm

Modified: branches/rug/lib/Socialtext/Apache/User.pm
===================================================================
--- branches/rug/lib/Socialtext/Apache/User.pm	2007-01-30 22:23:00 UTC (rev 1001)
+++ branches/rug/lib/Socialtext/Apache/User.pm	2007-01-30 22:32:07 UTC (rev 1002)
@@ -75,7 +75,7 @@
         if ($always_check_apache || Socialtext::AppConfig->check_apache_authen)
            && $r->connection->user;
 
-    my %user_data = _get_cookie_value(COOKIE_NAME);
+    my %user_data = _get_cookie_value($r, COOKIE_NAME);
 
     return unless keys %user_data;
 
@@ -109,13 +109,14 @@
             ( -domain  => '.' . Socialtext::AppConfig->cookie_domain ) :
             ()
           ),
-        )->bake;
+        )->bake($r);
 }
 
 sub _get_cookie_value {
+    my $r = shift;
     my $name = shift;
 
-    my $cookies = Socialtext::Rug::Cookie->fetch;
+    my $cookies = Socialtext::Rug::Cookie->fetch($r);
 
     return unless $cookies;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.