Skip to content

Fix Travis for POC PR ;) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2016
Merged

Fix Travis for POC PR ;) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b73c279
Update tagged_item.php
zero-24 May 6, 2016
8fc8eee
Update contact.php
zero-24 May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions components/com_contact/layouts/tagged_item/contact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@

defined('JPATH_BASE') or die;

$item = $displayData['item'];
JModelLegacy::addIncludePath('components/com_contact/models');

$item = $displayData['item'];
$model = JModelLegacy::getInstance('contact', 'ContactModel');
$contact = $model->getItem($item->content_item_id);
$lang = JFactory::getLanguage()->load('com_contact');

$lang = JFactory::getLanguage()->load('com_contact');
?>
<h3>
<a href="<?php echo JRoute::_(TagsHelperRoute::getItemRoute($item->content_item_id, $item->core_alias, $item->core_catid, $item->core_language, $item->type_alias, $item->router)); ?>">
Expand All @@ -23,16 +24,15 @@
</h3>
<dl class="dl-horizontal">
<?php if ($contact->address) : ?>
<dt><?php echo JText::_('COM_CONTACT_ADDRESS') ?></dt>
<dt><?php echo JText::_('COM_CONTACT_ADDRESS'); ?></dt>
<dd><?php echo $contact->address; ?></dd>
<?php endif; ?>
<?php if ($contact->country) : ?>
<dt><?php echo JText::_('COM_CONTACT_COUNTRY') ?></dt>
<dt><?php echo JText::_('COM_CONTACT_COUNTRY'); ?></dt>
<dd><?php echo $contact->country; ?></dd>
<?php endif; ?>
</dl>
<?php if ($item->core_images) : ?>
<img src="<?php echo $item->core_images; ?>" class="ss-image pull-right img-polaroid">
<?php endif; ?>
<?php echo $item->core_body; ?>

2 changes: 1 addition & 1 deletion layouts/joomla/content/tagged_item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
defined('JPATH_BASE') or die;

$item = $displayData['item'];

?>
<h3>
<a href="<?php echo JRoute::_(TagsHelperRoute::getItemRoute($item->content_item_id, $item->core_alias, $item->core_catid, $item->core_language, $item->type_alias, $item->router)); ?>">
<?php echo $this->escape($item->core_title); ?>
</a>
</h3>
<?php echo $item->core_body; ?>