From 62bc641bbd593cecb814b97fc4db664445baa2aa Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Fri, 4 Jun 2010 21:34:43 +0000
Subject: [PATCH] fix rss and install

---
 classes/actions/ActionRss.class.php            | 12 ++++++------
 install/index.php                              |  2 +-
 templates/skin/new/actions/ActionRss/index.tpl |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/classes/actions/ActionRss.class.php b/classes/actions/ActionRss.class.php
index e8e6306c..1f8c3134 100644
--- a/classes/actions/ActionRss.class.php
+++ b/classes/actions/ActionRss.class.php
@@ -77,7 +77,7 @@ class ActionRss extends Action {
 		$aResult=$this->Topic_GetTopicsNew(1,Config::Get('module.topic.per_page')*2,false);			
 		$aTopics=$aResult['collection'];
 		
-		$aChannel['title']=Config::Get('path.root.web');
+		$aChannel['title']=Config::Get('view.name');
 		$aChannel['link']=Config::Get('path.root.web');
 		$aChannel['description']=Config::Get('path.root.web').' / RSS channel';
 		$aChannel['language']='ru';
@@ -111,7 +111,7 @@ class ActionRss extends Action {
 		$aResult=$this->Comment_GetCommentsAll('topic',1,Config::Get('module.comment.per_page')*2,$aCloseTopics);
 		$aComments=$aResult['collection'];
 		
-		$aChannel['title']=Config::Get('path.root.web');
+		$aChannel['title']=Config::Get('view.name');
 		$aChannel['link']=Config::Get('path.root.web');
 		$aChannel['description']=Config::Get('path.root.web').' / RSS channel';
 		$aChannel['language']='ru';
@@ -146,7 +146,7 @@ class ActionRss extends Action {
 		$aComments=$this->Comment_GetCommentsByTargetId($oTopic->getId(),'topic');
 		$aComments=$aComments['comments'];
 		
-		$aChannel['title']=Config::Get('path.root.web');
+		$aChannel['title']=Config::Get('view.name');
 		$aChannel['link']=Config::Get('path.root.web');
 		$aChannel['description']=Config::Get('path.root.web').' / RSS channel';
 		$aChannel['language']='ru';
@@ -176,7 +176,7 @@ class ActionRss extends Action {
 		$aResult=$this->Topic_GetTopicsByTag($sTag,1,Config::Get('module.topic.per_page')*2,false);
 		$aTopics=$aResult['collection'];
 		
-		$aChannel['title']=Config::Get('path.root.web');
+		$aChannel['title']=Config::Get('view.name');
 		$aChannel['link']=Config::Get('path.root.web');
 		$aChannel['description']=Config::Get('path.root.web').' / RSS channel';
 		$aChannel['language']='ru';
@@ -210,7 +210,7 @@ class ActionRss extends Action {
 		}
 		$aTopics=$aResult['collection'];
 		
-		$aChannel['title']=Config::Get('path.root.web');
+		$aChannel['title']=Config::Get('view.name');
 		$aChannel['link']=Config::Get('path.root.web');
 		$aChannel['description']=Config::Get('path.root.web').' / '.$oBlog->getTitle().' / RSS channel';
 		$aChannel['language']='ru';
@@ -252,7 +252,7 @@ class ActionRss extends Action {
 		}
 		$aTopics=$aResult['collection'];
 		
-		$aChannel['title']=Config::Get('path.root.web');
+		$aChannel['title']=Config::Get('view.name');
 		$aChannel['link']=Config::Get('path.root.web');
 		$aChannel['description']=($this->sUserLogin)
 			? Config::Get('path.root.web').' / '.$oUser->getLogin().' / RSS channel'
diff --git a/install/index.php b/install/index.php
index ddf27f8f..493adff1 100644
--- a/install/index.php
+++ b/install/index.php
@@ -17,7 +17,7 @@
 
 error_reporting(E_ALL);
 set_time_limit(0);
-define('LS_VERSION','0.4');
+define('LS_VERSION','0.4.1');
 
 class Install {
 	/**
diff --git a/templates/skin/new/actions/ActionRss/index.tpl b/templates/skin/new/actions/ActionRss/index.tpl
index 6e7225e0..acb02cf1 100644
--- a/templates/skin/new/actions/ActionRss/index.tpl
+++ b/templates/skin/new/actions/ActionRss/index.tpl
@@ -12,7 +12,7 @@
 	<generator>{$aChannel.generator}</generator>
 {foreach from=$aItems item=oItem}
 		<item>
-			<title><![CDATA[{$oItem.title|escape:'html'}]]></title>
+			<title>{$oItem.title|escape:'html'}</title>
 			<guid isPermaLink="true">{$oItem.guid}</guid>
 			<link>{$oItem.link}</link>
 			<dc:creator>{$oItem.author}</dc:creator>