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

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Mon Sep 17 18:15:33 2007
New Revision: 4126

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

Log:
 r67334 at 000-251-384:  jesse | 2007-09-17 18:15:06 -0400
 * Don't do weird things with loading model subclasses


Modified: jifty/trunk/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/trunk/lib/Jifty/ClassLoader.pm	(original)
+++ jifty/trunk/lib/Jifty/ClassLoader.pm	Mon Sep 17 18:15:33 2007
@@ -330,7 +330,7 @@
     
     # Construct the list of models for the application for later reference
     my %models;
-    $models{$_} = 1 for grep {/^($base)::Model::(.*)$/ and not /Collection$/} $self->plugins;
+    $models{$_} = 1 for grep {/^($base)::Model::(.*)$/ and not /Collection(?:$||\:\:)/} $self->plugins;
     $self->models(sort keys %models);
 
     # Load all those models and model-related actions, notifications, and events
@@ -345,7 +345,7 @@
     my $self = shift;
     my $full = shift;
     my $base = $self->{base};
-    my($short) = $full =~ /::Model::(.*)/;
+    my($short) = $full =~ /::Model::(\w*)/;
     Jifty::Util->require($full . "Collection");
     Jifty::Util->require($base . "::Action::" . $_ . $short)
         for qw/Create Update Delete Search/;