From 0f61b3009e013edb933ea681db678f4808b52e55 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 14 Feb 2005 14:56:12 +0000
Subject: [PATCH] fixed template problems

---
 lib/WebGUI/Asset/Wobject/DataForm.pm          |  2 +-
 lib/WebGUI/Asset/Wobject/SyndicatedContent.pm | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 13aae3eaa..3f3a79948 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -610,7 +610,7 @@ sub view {
 	WebGUI::Style::setLink($session{config}{extrasURL}.'/tabs/tabs.css', {"type"=>"text/css"});
 	WebGUI::Style::setScript($session{config}{extrasURL}.'/tabs/tabs.js', {"language"=>"JavaScript"});
 	$var = $passedVars || $self->getRecordTemplateVars($var);
-	return $self->processTemplate($var,"DataForm",$self->get("templateId"));
+	return $self->processTemplate($var,$self->get("templateId"));
 }
 
 
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index 7910cfa64..341fbaf1a 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -98,6 +98,7 @@ sub getEditForm {
 	return $tabform;
 }
 
+#-------------------------------------------------------------------
 # strip all html tags from the given data structure.  This is important to
 # prevent cross site scripting attacks
 my $_stripped_html = {};
@@ -124,6 +125,7 @@ sub _strip_html {
         return $_[0];
 }
 
+#-------------------------------------------------------------------
 # horrible kludge to find the channel or item record
 # in the varying kinds of rss structures returned by RSSLite
 sub _find_record {
@@ -154,6 +156,7 @@ sub _find_record {
         return undef;
 }
 
+#-------------------------------------------------------------------
 # Copy the guid field to the link field if the guid looks like a link.
 # This is a kludge that gets around the fact that some folks use the link
 # field as the link to the story while others use it as the link
@@ -189,6 +192,7 @@ sub _normalize_items {
         }
 }
 
+#-------------------------------------------------------------------
 sub _get_rss_data {
         my ($url) = @_;
         
@@ -259,6 +263,7 @@ sub _get_rss_data {
         return $rss;
 }
 
+#-------------------------------------------------------------------
 # rss items don't have a standard date, so timestamp them the first time
 # we see them and use that timestamp as the date.  Periodically nuke the
 # whole database to keep the thing from growing too large
@@ -278,6 +283,7 @@ sub _assign_rss_dates {
         }
   }
 
+#-------------------------------------------------------------------
 sub _get_aggregate_items {
 	my $self = shift;
 	my $urls = shift;
@@ -328,6 +334,7 @@ sub _get_aggregate_items {
         return $items;
 }  
 
+#-------------------------------------------------------------------
 # interleave stories from each feed, up to a total of $_aggregate_size
 sub _view_aggregate_feed {
 	my $self = shift;
@@ -338,7 +345,7 @@ sub _view_aggregate_feed {
         $var{'channel.description'} = $self->get("description");
         $var{item_loop} = $self->_get_aggregate_items($urls, $maxHeadlines);
         
-        return $self->processTemplate(\%var,"SyndactedContent");
+        return $self->processTemplate(\%var,$self->get("templateId"));
 }
 
 
@@ -362,9 +369,10 @@ sub _view_single_feed {
                              });
         }
         $var{item_loop} = \@items;
-        return $self->processTemplate(\%var,"SyndicatedContent");
+        return $self->processTemplate(\%var,$self->get("templateId"));
 }
 
+#-------------------------------------------------------------------
 sub view {
 	my $self = shift;
 	$self->logView() if ($session{setting}{passiveProfilingEnabled});