[Jifty-commit] r746 - in jifty/trunk: lib/Jifty lib/Jifty/Web
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Mar 27 18:36:57 EST 2006
Author: alexmv
Date: Mon Mar 27 18:36:56 2006
New Revision: 746
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Web.pm
jifty/trunk/lib/Jifty/Web/PageRegion.pm
Log:
r11900 at zoq-fot-pik: chmrr | 2006-03-27 18:36:45 -0500
* When bootstrapping regions during fragment requests, fragments can
show up more than once
Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm (original)
+++ jifty/trunk/lib/Jifty/Web.pm Mon Mar 27 18:36:56 2006
@@ -1119,7 +1119,8 @@
} while ($f = $f->parent);
for $f (reverse @regions) {
- my $new = Jifty::Web::PageRegion->new(
+ my $new = $self->get_region( join '-', grep {$_} $self->qualified_region, $f->name );
+ $new ||= Jifty::Web::PageRegion->new(
name => $f->name,
path => $f->path,
region_wrapper => $f->wrapper,
Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm (original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm Mon Mar 27 18:36:56 2006
@@ -189,7 +189,7 @@
# Keep track of the fully qualified name (which should be unique)
$self->log->warn("Repeated region: " . $self->qualified_name)
- if Jifty->web->{'regions'}{ $self->qualified_name };
+ if Jifty->web->get_region( $self->qualified_name ) and Jifty->web->get_region( $self->qualified_name ) ne $self;
Jifty->web->{'regions'}{ $self->qualified_name } = $self;
# Merge in the settings passed in via state variables
More information about the Jifty-commit
mailing list