Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

# [#28198] Beez 5 generating warings/notices. Thanks Elin

  • Loading branch information...
commit 12fbf668307ad3b34d090caf2f9fd38927913d73 1 parent b366f01
@elinw elinw authored infograf768 committed
View
3  installation/CHANGELOG
@@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
+05-Mar-2012 Jean-Marie Simonet
+ # [#28198] Beez 5 generating warings/notices. Thanks Elin
+
04-Mar-2012 Jean-Marie Simonet
# [#28190] com_search: Show Search Results results in PHP fatal error. Thanks John
#$ [#27751] Installation - Check to ensure the schema file exists. Thanks Michael and Mark
View
36 templates/beez5/html/com_content/article/default.php
@@ -36,7 +36,7 @@
</h1>
<?php endif; ?>
<?php
-if ($this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative)
+if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative)
{
echo $this->item->pagination;
}
@@ -155,12 +155,14 @@
<?php echo $this->item->toc; ?>
<?php endif; ?>
-<?php if( (isset($urls) AND ($urls->urls_position=='0')) or ( $params->get('urls_position')=='0' AND ($urls->urls_position=="")) ): ?>
+<?php if (isset($urls) AND ((!empty($urls->urls_position) AND ($urls->urls_position=='0')) OR ($params->get('urls_position')=='0' AND empty($urls->urls_position) ))
+ OR (empty($urls->urls_position) AND (!$params->get('urls_position')))): ?>
+
<?php echo $this->loadTemplate('links'); ?>
<?php endif; ?>
<?php if (isset($images->image_fulltext) and !empty($images->image_fulltext)) : ?>
<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
-
+
<div class="img-fulltext-"<?php echo htmlspecialchars($imgfloat); ?>">
<img
<?php if ($images->image_fulltext_caption):
@@ -170,28 +172,24 @@
</div>
<?php endif; ?>
<?php
-if ($this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative)
- {
- echo $this->item->pagination;
- }
+if (!empty($this->item->pagination) AND $this->item->pagination AND !$this->item->paginationposition AND !$this->item->paginationrelative):
+ echo $this->item->pagination;
+ endif;
?>
<?php echo $this->item->text; ?>
<?php
-if ($this->item->pagination && $this->item->paginationposition && !$this->item->paginationrelative)
-{
- echo $this->item->pagination;
-}
-?>
+if (!empty($this->item->pagination) AND $this->item->pagination AND $this->item->paginationposition AND!$this->item->paginationrelative):
+ echo $this->item->pagination;?>
+<?php endif; ?>
+
+ <?php if (isset($urls) AND ((!empty($urls->urls_position) AND ($urls->urls_position=='1')) OR ( $params->get('urls_position')=='1') )): ?>
- <?php if( (isset($urls) AND ($urls->urls_position=='1')) or ( $params->get('urls_position')=='1') AND ($urls->urls_position=="") ): ?>
<?php echo $this->loadTemplate('links'); ?>
<?php endif; ?>
- <?php
- if ($this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative)
- {
- echo $this->item->pagination;
- }
- ?>
+<?php
+if (!empty($this->item->pagination) AND $this->item->pagination AND $this->item->paginationposition AND $this->item->paginationrelative):
+ echo $this->item->pagination;?>
+<?php endif; ?>
<?php echo $this->item->event->afterDisplayContent; ?>
</article>
View
2  templates/beez5/html/com_content/category/blog.php
@@ -17,7 +17,7 @@
//evtl. ersetzen durch JPATH_COMPONENT.'/views/...'
} else {
JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
-$cparams =& JComponentHelper::getParams('com_media');
+$cparams = JComponentHelper::getParams('com_media');
// If the page class is defined, add to class as suffix.
// It will be a separate class if the user starts it with a space
Please sign in to comment.
Something went wrong with that request. Please try again.