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

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Thu Dec 29 19:21:02 2005
New Revision: 428

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

Log:
 r8513 at zoq-fot-pik:  chmrr | 2005-12-29 19:20:12 -0500
  * Don't directly call into JSON::Converter
  * Clear output before returning fragments XML


Modified: jifty/trunk/lib/Jifty/JSON.pm
==============================================================================
--- jifty/trunk/lib/Jifty/JSON.pm	(original)
+++ jifty/trunk/lib/Jifty/JSON.pm	Thu Dec 29 19:21:02 2005
@@ -72,7 +72,7 @@
         $arg =~ s/([\x00-\x07\x0b\x0e-\x1f])/'\\u00' . unpack('H2',$1)/eg;
         return "'" . $arg ."'";
     };
-    return JSON::Converter::objToJson($obj, $args);
+    return JSON::objToJson($obj, $args);
 }
 
 1;

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Thu Dec 29 19:21:02 2005
@@ -1055,7 +1055,9 @@
     # text/html -- so we have to override them after the fact.
     $self->mason->cgi_request->content_type('text/xml; charset=utf=8');
 
-    # Output the data
+    # Clear the buffer (in case something else snuck out) then output
+    # the data and bail
+    $self->mason->clear_buffer;
     $self->mason->out($output);
     $self->mason->abort;
 }