[Jifty-commit] r7295 - jifty/trunk/lib/Jifty

Jifty commits jifty-commit at lists.jifty.org
Fri Jul 3 17:20:41 EDT 2009


Author: alexmv
Date: Fri Jul  3 17:20:40 2009
New Revision: 7295

Modified:
   jifty/trunk/lib/Jifty/Object.pm

Log:
Allow Jifty::Object->_get_current_user to be called as a class method

Modified: jifty/trunk/lib/Jifty/Object.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Object.pm	(original)
+++ jifty/trunk/lib/Jifty/Object.pm	Fri Jul  3 17:20:40 2009
@@ -87,13 +87,14 @@
         }
     };
 
+    # Just return it if we're a cless method
+    return $cu || Jifty->web->current_user unless ref $self;
+
     # If we found something, return it
     return $self->current_user( $cu ) if $cu;
 
     # Fallback to web ui framework
-    if ( Jifty->web ) {
-        return $self->current_user( Jifty->web->current_user );
-    }
+    return $self->current_user( Jifty->web->current_user ) if Jifty->web;
 
     return undef;
 }


More information about the Jifty-commit mailing list