diff --git a/components/com_contact/views/category/view.feed.php b/components/com_contact/views/category/view.feed.php index 91e0f7230ac7e..0ea1fed6c1262 100644 --- a/components/com_contact/views/category/view.feed.php +++ b/components/com_contact/views/category/view.feed.php @@ -18,6 +18,12 @@ */ class ContactViewCategory extends JViewCategoryfeed { + /** + * @var string The name of the view to link individual items to + * @since 3.2 + */ + protected $viewName = 'contact'; + /** * Method to reconcile non standard names from components to usage in this class. * Typically overriden in the component feed view class. diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php index b8e56a9a74e96..0b9ecee18e435 100644 --- a/components/com_content/views/category/view.feed.php +++ b/components/com_content/views/category/view.feed.php @@ -18,6 +18,12 @@ */ class ContentViewCategory extends JViewCategoryfeed { + /** + * @var string The name of the view to link individual items to + * @since 3.2 + */ + protected $viewName = 'article'; + /** * Method to reconcile non standard names from components to usage in this class. * Typically overriden in the component feed view class. diff --git a/components/com_weblinks/views/category/view.feed.php b/components/com_weblinks/views/category/view.feed.php index 8778f0fa81c46..f0e243e6c3b7b 100644 --- a/components/com_weblinks/views/category/view.feed.php +++ b/components/com_weblinks/views/category/view.feed.php @@ -18,4 +18,9 @@ */ class WeblinksViewCategory extends JViewCategoryfeed { + /** + * @var string The name of the view to link individual items to + * @since 3.2 + */ + protected $viewName = 'weblink'; } diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 144940a6403d1..26aabef12663a 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -25,11 +25,14 @@ $ -> Language fix or change - -> Removed ! -> Note +16-Nov-2013 Michael Babker + # [#32662] Feed information missing in RSS type Syndication Feed. Thanks George Wilson + 13-Nov-2013 Jean-Marie Simonet # [#32412] protostar error page logo Thanks David Beuving + [#32660] TinyMCE editor lacks link relation option Thanks Artur Stępień - # [#32626] *Banners Manager: Options is gone when filtering by a category - +$ [#32678] TinyMCE 4 in Joomla 3.2 has no image advanced options + # [#32626] *Banners Manager: Options is gone when filtering by a category + +$ [#32678] TinyMCE 4 in Joomla 3.2 has no image advanced options # [#32672] Fixed problem with featured view Thanks Bruno Batista $ [#32546] Language strings missing for com_tags Thanks George Wilson $ [#32680] Missing string Thanks David Jardin diff --git a/libraries/legacy/view/categoryfeed.php b/libraries/legacy/view/categoryfeed.php index 15d11cba2f256..535ec76fd4504 100644 --- a/libraries/legacy/view/categoryfeed.php +++ b/libraries/legacy/view/categoryfeed.php @@ -33,6 +33,25 @@ public function display($tpl = null) $document = JFactory::getDocument(); $extension = $app->input->getString('option'); + $contentType = $extension . '.' . $this->viewName; + + $ucmType = new JUcmType; + $ucmRow = $ucmType->getTypeByAlias($contentType); + $ucmMapCommon = json_decode($ucmRow->field_mappings)->common; + $createdField = null; + $titleField = null; + + if (is_object($ucmMapCommon)) + { + $createdField = $ucmMapCommon->core_created_time; + $titleField = $ucmMapCommon->core_title; + } + elseif (is_array($ucmMapCommon)) + { + $createdField = $ucmMapCommon[0]->core_created_time; + $titleField = $ucmMapCommon[0]->core_title; + } + $document->link = JRoute::_(JHelperRoute::getCategoryRoute($app->input->getInt('id'), $language = 0, $extension)); $app->input->set('limit', $app->get('feed_limit')); @@ -55,17 +74,32 @@ public function display($tpl = null) $this->reconcileNames($item); // Strip html from feed item title - $title = $this->escape($item->title); - $title = html_entity_decode($title, ENT_COMPAT, 'UTF-8'); + if ($titleField) + { + $title = $this->escape($item->$titleField); + $title = html_entity_decode($title, ENT_COMPAT, 'UTF-8'); + } + else + { + $title = ''; + } // URL link to article $router = new JHelperRoute; - $link = JRoute::_($router->getRoute($item->id, $item->catid)); + $link = JRoute::_($router->getRoute($item->id, $contentType, null, null, $item->catid)); // Strip HTML from feed item description text. $description = $item->description; $author = $item->created_by_alias ? $item->created_by_alias : $item->author; - $date = isset($item->date) ? date('r', strtotime($item->date)) : ''; + + if ($createdField) + { + $date = isset($item->$createdField) ? date('r', strtotime($item->$createdField)) : ''; + } + else + { + $date = ''; + } // Load individual item creator class. $feeditem = new JFeedItem;