Skip to content

Commit

Permalink
Fix deprecated error when using pagination->get()
Browse files Browse the repository at this point in the history
  • Loading branch information
@khanhlh
khanhlh committed May 29, 2014
1 parent 9c8c7a9 commit 21152e0
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 28 deletions.
4 changes: 3 additions & 1 deletion source/plg_system_t3/base-bs3/html/com_contact/featured/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
<?php endif; ?>

<?php echo $this->loadTemplate('items'); ?>
<?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $pagesTotal > 1)) : ?>
<div class="pagination-wrap">

<?php if ($this->params->def('show_pagination_results', 1)) : ?>
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base-bs3/html/com_content/archive/default_items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
<?php endforeach; ?>
</div>

<?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $pagesTotal > 1)) : ?>
<nav class="pagination-wrap clearfix">

<?php if ($this->params->def('show_pagination_results', 1)) : ?>
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base-bs3/html/com_content/category/blog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@
<?php echo $this->loadTemplate('children'); ?> </div>
<?php endif; ?>

<?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination-wrap">
<?php if ($this->params->def('show_pagination_results', 1)) : ?>
<div class="counter"> <?php echo $this->pagination->getPagesCounter(); ?></div>
Expand Down
2 changes: 1 addition & 1 deletion source/plg_system_t3/base-bs3/html/com_content/category/default_articles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<?php // Add pagination links ?>
<?php if (!empty($this->items)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $pagesTotal = $this->pagination->get('pages.total');
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination">

Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base-bs3/html/com_content/featured/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@
<?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?>
<nav class="pagination-wrap clearfix">

<?php if ($this->params->def('show_pagination_results', 1) && $this->pagination->get('pages.total') > 1) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if ($this->params->def('show_pagination_results', 1) && $pagesTotal > 1) : ?>
<div class="counter">
<?php echo $this->pagination->getPagesCounter(); ?>
</div>
Expand Down
5 changes: 3 additions & 2 deletions source/plg_system_t3/base-bs3/html/com_newsfeeds/category/default_items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@

<?php // Add pagination links ?>
<?php if (!empty($this->items)) : ?>
<?php if (($this->params->def('show_pagination', 2) == 1 ||
($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination-wrap">
<?php if ($this->params->def('show_pagination_results', 1)) : ?>
<p class="counter pull-right">
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base-bs3/html/com_tags/tag/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
<?php endif; ?>

<?php echo $this->loadTemplate('items'); ?>
<?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination-wrap">
<?php if ($this->params->def('show_pagination_results', 1)) : ?>
<p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> </p>
Expand Down
16 changes: 1 addition & 15 deletions source/plg_system_t3/base-bs3/html/com_tags/tags/default_items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,7 @@
<?php // Add pagination links ?>
<?php if (!empty($this->items)) : ?>
<?php
if (version_compare(JVERSION, '3.0', 'ge'))
{
$pagesTotal = $this->pagination->pagesTotal;

}
else if (version_compare(JVERSION, '2.5', 'ge'))
{
$pagesTotal = $this->pagination->get('pages.total');

}
else
{
$pagesTotal = $this->pagination->get('pages.total');

}
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination-wrap">

Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base/html/com_contact/featured/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
<?php endif; ?>

<?php echo $this->loadTemplate('items'); ?>
<?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $pagesTotal > 1)) : ?>
<div class="pagination">

<?php if ($this->params->def('show_pagination_results', 1)) : ?>
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base/html/com_content/category/blog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@
<?php echo $this->loadTemplate('children'); ?> </div>
<?php endif; ?>

<?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination">
<?php if ($this->params->def('show_pagination_results', 1)) : ?>
<div class="counter"> <?php echo $this->pagination->getPagesCounter(); ?></div>
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base/html/com_content/category/default_articles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@

<?php // Add pagination links ?>
<?php if (!empty($this->items)) : ?>
<?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination">

<?php if ($this->params->def('show_pagination_results', 1)) : ?>
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base/html/com_content/featured/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@
</section>
<?php endif; ?>

<?php if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if ($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $pagesTotal > 1)) : ?>
<nav class="pagination">

<?php if ($this->params->def('show_pagination_results', 1) && $this->pagination->get('pages.total') > 1) : ?>
Expand Down
4 changes: 3 additions & 1 deletion source/plg_system_t3/base/html/com_newsfeeds/category/default_items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@

<?php // Add pagination links ?>
<?php if (!empty($this->items)) : ?>
<?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
<?php
$pagesTotal = isset($this->pagination->pagesTotal) ? $this->pagination->pagesTotal : $this->pagination->get('pages.total');
if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($pagesTotal > 1)) : ?>
<div class="pagination">
<?php if ($this->params->def('show_pagination_results', 1)) : ?>
<p class="counter pull-right">
Expand Down

0 comments on commit 21152e0

Please sign in to comment.