[Jifty-commit] r4747 - in jifty/trunk: lib/Jifty lib/Jifty/Test/WWW

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Wed Dec 19 12:20:27 2007
New Revision: 4747

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Client.pm
   jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm

Log:
 r49217 at onn:  sartak | 2007-12-19 12:20:11 -0500
 Revert 4746 because it's actually not evil at all


Modified: jifty/trunk/lib/Jifty/Client.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Client.pm	(original)
+++ jifty/trunk/lib/Jifty/Client.pm	Wed Dec 19 12:20:27 2007
@@ -204,7 +204,7 @@
 
     # Fire off the request, evaluate the result, and return it
     my $result = $self->request( $request );
-    my $content = Jifty::YAML::Load($result->content)->{action};
+    my $content = eval { Jifty::YAML::Load($result->content)->{action} } || undef;
     $self->back;
     return $content;
 }

Modified: jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm	(original)
+++ jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm	Wed Dec 19 12:20:27 2007
@@ -254,7 +254,7 @@
         )
     );
     my $result = $self->request( $request );
-    my $content = Jifty::YAML::Load($result->content)->{action};
+    my $content = eval { Jifty::YAML::Load($result->content)->{action} } || undef;
     $self->back;
     return $content;
 }