[Bast-commits] r9407 - DBIx-Class/0.08/trunk/lib/DBIx/Class

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2010-05-20 18:19:14 +0100 (Thu, 20 May 2010)
New Revision: 9407

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
Log:
don't try and ensure_class_loaded an object. this doesn't work.

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2010-05-20 14:28:18 UTC (rev 9406)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2010-05-20 17:19:14 UTC (rev 9407)
@@ -1138,7 +1138,9 @@
 sub result_class {
   my ($self, $result_class) = @_;
   if ($result_class) {
-    $self->ensure_class_loaded($result_class);
+    unless (ref $result_class) { # don't fire this for an object
+      $self->ensure_class_loaded($result_class);
+    }
     $self->_result_class($result_class);
     $self->{attrs}{result_class} = $result_class if ref $self;
   }