[Jifty-commit] r1484 - in jifty/branches/plugin_rewrite: . lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Wed Jul 5 21:40:27 EDT 2006


Author: jpeacock
Date: Wed Jul  5 21:40:23 2006
New Revision: 1484

Modified:
   jifty/branches/plugin_rewrite/   (props changed)
   jifty/branches/plugin_rewrite/META.yml
   jifty/branches/plugin_rewrite/lib/Jifty/Action/Record.pm
   jifty/branches/plugin_rewrite/lib/Jifty/Web.pm

Log:
sync with trunk before merging back

Modified: jifty/branches/plugin_rewrite/META.yml
==============================================================================
--- jifty/branches/plugin_rewrite/META.yml	(original)
+++ jifty/branches/plugin_rewrite/META.yml	Wed Jul  5 21:40:23 2006
@@ -39,7 +39,7 @@
   HTML::Mason::Plugin: 0
   HTTP::Cookies: 0
   HTTP::Date: 0
-  HTTP::Server::Simple: 0.10
+  HTTP::Server::Simple: 0.20
   HTTP::Server::Simple::Recorder: 0
   Hash::Merge: 0
   Hook::LexWrap: 0

Modified: jifty/branches/plugin_rewrite/lib/Jifty/Action/Record.pm
==============================================================================
--- jifty/branches/plugin_rewrite/lib/Jifty/Action/Record.pm	(original)
+++ jifty/branches/plugin_rewrite/lib/Jifty/Action/Record.pm	Wed Jul  5 21:40:23 2006
@@ -80,7 +80,7 @@
         # We could leave out the explicit current user, but it'd have
         # a slight negative performance implications
         $self->record(
-            $record_class->new( current_user => Jifty->web->current_user ) );
+            $record_class->new( current_user => $self->current_user ) );
         my %given_pks = ();
         for my $pk ( @{ $self->record->_primary_keys } ) {
             $given_pks{$pk} = $self->argument_value($pk)

Modified: jifty/branches/plugin_rewrite/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/plugin_rewrite/lib/Jifty/Web.pm	(original)
+++ jifty/branches/plugin_rewrite/lib/Jifty/Web.pm	Wed Jul  5 21:40:23 2006
@@ -407,6 +407,7 @@
         class     => undef,
         moniker   => undef,
         arguments => {},
+        current_user => $self->current_user,
         @_
     );
 
@@ -441,7 +442,7 @@
 
     my $action;
     # XXX TODO bullet proof
-    eval { $action = $class->new( %args, arguments => {%arguments}, current_user => $self->current_user ); };
+    eval { $action = $class->new( %args, arguments => {%arguments} ); };
     if ($@) {
         my $err = $@;
         $self->log->fatal($err);


More information about the Jifty-commit mailing list