[pLog-svn] r3511 - in plog/trunk: class/summary/action templates/summary/rss

[mark at devel.lifetype.net]

Author: mark
Date: 2006-06-02 18:47:14 +0000 (Fri, 02 Jun 2006)
New Revision: 3511

Modified:
   plog/trunk/class/summary/action/summaryrssaction.class.php
   plog/trunk/templates/summary/rss/atom.template
   plog/trunk/templates/summary/rss/rss090.template
   plog/trunk/templates/summary/rss/rss10.template
   plog/trunk/templates/summary/rss/rss20.template
   plog/trunk/templates/summary/rss/xml.template
Log:
Fixed bug http://bugs.lifetype.net/view.php?id=916

Modified: plog/trunk/class/summary/action/summaryrssaction.class.php
===================================================================
--- plog/trunk/class/summary/action/summaryrssaction.class.php	2006-06-02 17:19:27 UTC (rev 3510)
+++ plog/trunk/class/summary/action/summaryrssaction.class.php	2006-06-02 18:47:14 UTC (rev 3511)
@@ -174,16 +174,17 @@
 				if( !$blogslist )
 					$blogslist = Array();
 					
-				// this 'url' object is just a dummy one... But we cannot get it from the list
-				// of blogs that we fetched because it could potentially be null! Besides, we only
-				// need it to generate the base url to rss.css and to summary.php, so no need to
-				// have a fully-featured object
-				$this->_view->setValue( "url", new RawRequestGenerator( null ));
 				$this->_view->setValue( "blogs", $blogslist );								
 			}
 			
 			$this->_view->setValue( "type", $this->_mode );
 			$this->_view->setValue( "summary", true );
+
+			// this 'url' object is just a dummy one... But we cannot get it from the list
+			// of blogs that we fetched because it could potentially be null! Besides, we only
+			// need it to generate the base url to rss.css and to summary.php, so no need to
+			// have a fully-featured object
+			$this->_view->setValue( "url", new RawRequestGenerator( null ));
 			
 			$this->setCommonData();		
 

Modified: plog/trunk/templates/summary/rss/atom.template
===================================================================
--- plog/trunk/templates/summary/rss/atom.template	2006-06-02 17:19:27 UTC (rev 3510)
+++ plog/trunk/templates/summary/rss/atom.template	2006-06-02 18:47:14 UTC (rev 3511)
@@ -1,5 +1,3 @@
-{assign var=blog value=$posts[0]->getBlogInfo()}
-{assign var=url value=$blog->getBlogRequestGenerator()}
 <?xml version="1.0" encoding="{$locale->getCharset()}"?>
 <feed version="0.3" xmlns="http://purl.org/atom/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xml:lang="{$locale->getLanguageId()|lower}"> 
 <title>Your site title</title> 

Modified: plog/trunk/templates/summary/rss/rss090.template
===================================================================
--- plog/trunk/templates/summary/rss/rss090.template	2006-06-02 17:19:27 UTC (rev 3510)
+++ plog/trunk/templates/summary/rss/rss090.template	2006-06-02 18:47:14 UTC (rev 3511)
@@ -1,5 +1,3 @@
-{assign var=blog value=$posts[0]->getBlogInfo()}
-{assign var=url value=$blog->getBlogRequestGenerator()}
 <?xml version="1.0" encoding="{$locale->getCharset()}"?>
 <?xml-stylesheet href="{$url->getUrl("/styles/rss.css")}" type="text/css"?>
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://my.netscape.com/rdf/simple/0.9/">

Modified: plog/trunk/templates/summary/rss/rss10.template
===================================================================
--- plog/trunk/templates/summary/rss/rss10.template	2006-06-02 17:19:27 UTC (rev 3510)
+++ plog/trunk/templates/summary/rss/rss10.template	2006-06-02 18:47:14 UTC (rev 3511)
@@ -1,5 +1,3 @@
-{assign var=blog value=$posts[0]->getBlogInfo()}
-{assign var=url value=$blog->getBlogRequestGenerator()}
 <?xml version="1.0" encoding="{$locale->getCharset()}"?>
 <?xml-stylesheet href="{$url->getUrl("/styles/rss.css")}" type="text/css"?>
 <rdf:RDF

Modified: plog/trunk/templates/summary/rss/rss20.template
===================================================================
--- plog/trunk/templates/summary/rss/rss20.template	2006-06-02 17:19:27 UTC (rev 3510)
+++ plog/trunk/templates/summary/rss/rss20.template	2006-06-02 18:47:14 UTC (rev 3511)
@@ -1,5 +1,3 @@
-{assign var=blog value=$posts[0]->getBlogInfo()}
-{assign var=url value=$blog->getBlogRequestGenerator()}
 <?xml version="1.0" encoding="{$locale->getCharset()}"?>
 <?xml-stylesheet href="{$url->getUrl("/styles/rss.css")}" type="text/css"?>
 <rss version="2.0">

Modified: plog/trunk/templates/summary/rss/xml.template
===================================================================
--- plog/trunk/templates/summary/rss/xml.template	2006-06-02 17:19:27 UTC (rev 3510)
+++ plog/trunk/templates/summary/rss/xml.template	2006-06-02 18:47:14 UTC (rev 3511)
@@ -1,5 +1,3 @@
-{assign var=blog value=$posts[0]->getBlogInfo()}
-{assign var=url value=$blog->getBlogRequestGenerator()}
 <?xml version="1.0" encoding="{$locale->getCharset()}"?>
 <xmlsrc>
   <title>Your site title</title>