[Jifty-commit] r6649 - in jifty/trunk: share/web/templates/__jifty/webservices

Jifty commits jifty-commit at lists.jifty.org
Tue Mar 17 18:35:58 EDT 2009


Author: alexmv
Date: Tue Mar 17 18:35:58 2009
New Revision: 6649

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/share/web/templates/__jifty/webservices/xml

Log:
 r43365 at kohr-ah:  chmrr | 2009-03-17 18:35:43 -0400
 Work around a bug in 5.10 where nested loops trigger "Attempt to free unreferenced scalar"


Modified: jifty/trunk/share/web/templates/__jifty/webservices/xml
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/webservices/xml	(original)
+++ jifty/trunk/share/web/templates/__jifty/webservices/xml	Tue Mar 17 18:35:58 2009
@@ -15,24 +15,24 @@
 }
 
 FRAGMENT:
-for my $f ( Jifty->web->request->fragments ) {
+for my $fragment ( Jifty->web->request->fragments ) {
     # Set up the form if need be
     Jifty->web->form->_init;
-    Jifty->web->form->is_open(1) if $f->in_form;
+    Jifty->web->form->is_open(1) if $fragment->in_form;
 
     # Set up the region stack
     local Jifty->web->{'region_stack'} = [];
     my @regions;
     do {
-        push @regions, $f;
-    } while ($f = $f->parent);
+        push @regions, $fragment;
+    } while ($fragment = $fragment->parent);
 
-    for $f (reverse @regions) {
-        my $new = Jifty->web->get_region( join '-', grep {$_} Jifty->web->qualified_region, $f->name );
+    for my $current (reverse @regions) {
+        my $new = Jifty->web->get_region( join '-', grep {$_} Jifty->web->qualified_region, $current->name );
 
         # Arguments can be complex mapped hash values.  Get their
         # real values by mapping.
-        my %defaults = %{$f->arguments || {}};
+        my %defaults = %{$current->arguments || {}};
         for (keys %defaults) {
             my ($key, $value) = Jifty::Request::Mapper->map(destination => $_, source => $defaults{$_});
             delete $defaults{$_};
@@ -40,9 +40,9 @@
         }
 
         $new ||= Jifty::Web::PageRegion->new(
-            name           => $f->name,
-            path           => URI::Escape::uri_unescape($f->path),
-            region_wrapper => $f->wrapper,
+            name           => $current->name,
+            path           => URI::Escape::uri_unescape($current->path),
+            region_wrapper => $current->wrapper,
             parent         => Jifty->web->current_region,
             defaults       => \%defaults,
         );


More information about the Jifty-commit mailing list