From 1f44e63af2a470ad9bbde24776855f7c0276ea7d Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 13 Jan 2010 16:43:06 -0800
Subject: [PATCH] Fix infinite loop problems with inheritUrlFromParent

---
 lib/WebGUI/Asset.pm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 3a20dae6c..f0ecd79e8 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -159,7 +159,7 @@ property  extraHeadTags => (
             default         => undef,
             customDrawMethod=>  'drawExtraHeadTags',
           ); 
-after extraHeadTags => sub {
+around extraHeadTags => sub {
     my $self = shift;
     if (@_ > 1) {
         my $unpacked = $_[0];
@@ -218,10 +218,13 @@ property  inheritUrlFromParent  => (
             fieldType       => 'yesNo',
             default         => 0,
           );
-after inheritUrlFromParent => sub {
+around inheritUrlFromParent => sub {
+    my $orig = shift;
     my $self = shift;
-    return unless $self->inheritUrlFromParent;
-    $self->url($self->url);
+    $self->$orig(@_);
+    if (@_ > 0 && $_[0]) {
+        $self->url($self->url);
+    }
 };
 property  status => (
             noFormPost      => 1,
@@ -284,7 +287,7 @@ around BUILDARGS => sub {
         $revisionDate   = $className->getCurrentRevisionDate( $session, $assetId );
         return undef unless $revisionDate;
     }
-    
+
     my $properties = eval{$session->cache->get(["asset",$assetId,$revisionDate])};
     unless (exists $properties->{assetId}) { # can we get it from cache?
         my $sql = "select * from asset";
@@ -2351,7 +2354,7 @@ sub write {
     ##Write them to the db.
     my $db = $self->session->db;
     CLASS: foreach my $meta (reverse $self->meta->get_all_class_metas()) {
-        my $table       = $db->quote_identifier($meta->tableName);
+        my $table       = $db->quoteIdentifier($meta->tableName);
         my @properties  = $meta->get_property_list;
         my @values      = map { $self->$_ } @properties;      
         my @columnNames = map { $db->quote_identifier($_).'=?' } @properties;