Skip to content

Commit

Permalink
Code style
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiwoks committed Jul 28, 2014
1 parent 5cf70b5 commit 9b2298e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
10 changes: 5 additions & 5 deletions components/com_content/views/archive/tmpl/default_items.php
Expand Up @@ -122,10 +122,10 @@
</div>
<?php endif; ?>

<?php if (!$params->get('show_intro')) : ?>
<?php echo $item->event->afterDisplayTitle; ?>
<?php endif; ?>
<?php echo $item->event->beforeDisplayContent; ?>
<?php if (!$params->get('show_intro')) : ?>
<?php echo $item->event->afterDisplayTitle; ?>
<?php endif; ?>
<?php echo $item->event->beforeDisplayContent; ?>
<?php if ($params->get('show_intro')) :?>
<div class="intro" itemprop="articleBody"> <?php echo JHtml::_('string.truncateComplex', $item->introtext, $params->get('introtext_limit')); ?> </div>
<?php endif; ?>
Expand Down Expand Up @@ -206,7 +206,7 @@
</dl>
</div>
<?php endif; ?>
<?php echo $item->event->afterDisplayContent; ?>
<?php echo $item->event->afterDisplayContent; ?>
</div>
<?php endforeach; ?>
</div>
Expand Down
36 changes: 18 additions & 18 deletions components/com_content/views/archive/view.html.php
Expand Up @@ -54,30 +54,30 @@ public function display($tpl = null)
{
$item->parent_slug = null;
}

$item->event = new stdClass;

$dispatcher = JEventDispatcher::getInstance();
$item->event = new stdClass;

// Old plugins: Ensure that text property is available
if (!isset($item->text))
{
$item->text = $item->introtext;
}
JPluginHelper::importPlugin('content');
$dispatcher->trigger('onContentPrepare', array ('com_content.archive', &$item, &$item->params, 0));
$dispatcher = JEventDispatcher::getInstance();

// Old plugins: Use processed text as introtext
$item->introtext = $item->text;
// Old plugins: Ensure that text property is available
if (!isset($item->text))
{
$item->text = $item->introtext;
}
JPluginHelper::importPlugin('content');
$dispatcher->trigger('onContentPrepare', array ('com_content.archive', &$item, &$item->params, 0));

// Old plugins: Use processed text as introtext
$item->introtext = $item->text;

$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.archive', &$item, &$item->params, 0));
$item->event->afterDisplayTitle = trim(implode("\n", $results));
$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.archive', &$item, &$item->params, 0));
$item->event->afterDisplayTitle = trim(implode("\n", $results));

$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.archive', &$item, &$item->params, 0));
$item->event->beforeDisplayContent = trim(implode("\n", $results));
$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.archive', &$item, &$item->params, 0));
$item->event->beforeDisplayContent = trim(implode("\n", $results));

$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.archive', &$item, &$item->params, 0));
$item->event->afterDisplayContent = trim(implode("\n", $results));
$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.archive', &$item, &$item->params, 0));
$item->event->afterDisplayContent = trim(implode("\n", $results));
}

$form = new stdClass;
Expand Down

0 comments on commit 9b2298e

Please sign in to comment.