[Joomla-commits] r22945 - in development/trunk: components/com_content/views/category installation

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-03-23 10:06:16 -0500 (Fri, 23 Mar 2012)
New Revision: 22945

Modified:
development/trunk/components/com_content/views/category/view.feed.php
development/trunk/installation/CHANGELOG
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/components/com_content/views/category/view.feed.php
===================================================================
--- development/trunk/components/com_content/views/category/view.feed.php 2012-03-23 14:46:17 UTC (rev 22944)
+++ development/trunk/components/com_content/views/category/view.feed.php 2012-03-23 15:06:16 UTC (rev 22945)
@@ -57,7 +57,7 @@
$item->link = $link;
$item->description = $description;
$item->date = $date;
- $item->category = $row->category;
+ $item->category = $row->category_title;

$item->author = $author;
if ($feedEmail == 'site') {

Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-03-23 14:46:17 UTC (rev 22944)
+++ development/trunk/installation/CHANGELOG 2012-03-23 15:06:16 UTC (rev 22945)
@@ -28,6 +28,7 @@

23-Mar-2012 Christophe Demko
# [#28175] *Calendar readonly="true" status prevents loading custom calendars.
+ # [#28277] Wrong 'category' tag in category feed

22-Mar-2012 Jean-Marie Simonet
$ Updating installation ini files cbq-IQ, de-DE, sv-SE

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits