[Jifty-commit] r3037 - in jifty/trunk: lib

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Mar 20 20:58:57 EDT 2007


Author: jesse
Date: Tue Mar 20 20:58:57 2007
New Revision: 3037

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty.pm

Log:
 r53745 at pinglin:  jesse | 2007-03-20 20:57:00 -0400
  * Switch config to automatic instantiation


Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm	(original)
+++ jifty/trunk/lib/Jifty.pm	Tue Mar 20 20:58:57 2007
@@ -149,8 +149,6 @@
         @_
     );
 
-    # Load the configuration. stash it in ->config
-    Jifty->config( Jifty::Config->new() );
 
 
     # Now that we've loaded the configuration, we can remove the temporary 
@@ -223,6 +221,7 @@
 sub config {
     my $class = shift;
     $CONFIG = shift if (@_);
+    $CONFIG ||= Jifty::Config->new();
     return $CONFIG;
 }
 


More information about the Jifty-commit mailing list