[Jifty-commit] r3701 - in jifty/branches/virtual-models: . lib/Jifty

[jifty-commit at lists.jifty.org]

Author: sterling
Date: Thu Jul 19 10:27:23 2007
New Revision: 3701

Modified:
   jifty/branches/virtual-models/   (props changed)
   jifty/branches/virtual-models/lib/Jifty/API.pm
   jifty/branches/virtual-models/lib/Jifty/Notification.pm
   jifty/branches/virtual-models/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t

Log:
 r8117 at dynpc145:  andrew | 2007-07-19 09:26:49 -0500
 Mergedown from trunk. No new test failures.


Modified: jifty/branches/virtual-models/lib/Jifty/API.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/API.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/API.pm	Thu Jul 19 10:27:23 2007
@@ -85,13 +85,13 @@
     my $self   = shift;
     my $action = shift;
 
-    my $base_path = Jifty->app_class("Action");
+    my $base_path = Jifty->app_class;
 
     return $action
-        if $action =~ /^Jifty::/
-        or $action =~ /^\Q$base_path\E/;
+        if ($action =~ /^Jifty::/
+        or $action =~ /^\Q$base_path\E::/);
 
-    return $base_path . "::" . $action;
+    return $base_path . "::Action::" . $action;
 }
 
 =head2 reset

Modified: jifty/branches/virtual-models/lib/Jifty/Notification.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Notification.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/Notification.pm	Thu Jul 19 10:27:23 2007
@@ -107,7 +107,9 @@
 						       ],
 					     attributes => { charset => 'UTF-8' },
 					     text_body => $self->full_body,
-					     body => $self->full_html
+					     body => $self->full_html,
+                         embed => 0,
+                         inline_css => 0
 					    );
     } else {
             $message = Email::MIME->create(

Modified: jifty/branches/virtual-models/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
==============================================================================
--- jifty/branches/virtual-models/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t	(original)
+++ jifty/branches/virtual-models/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t	Thu Jul 19 10:27:23 2007
@@ -4,7 +4,7 @@
 
 use lib 't/lib';
 use Jifty::SubTest;
-use Jifty::Test tests => 8;
+use Jifty::Test tests => 9;
 use Jifty::Test::WWW::Mechanize;
 use Test::Log4perl;