Skip to content
This repository
Browse code

Merge pull request #1531 from mahagr/pagination

Fix potentially broken code in JPagination
  • Loading branch information...
commit 5da2f904297af52c9dc9b7b5b84131c997ed6ba4 2 parents 049b784 + 86f44a8
Sam Moffatt authored
5  libraries/joomla/pagination/pagination.php
@@ -707,16 +707,13 @@ protected function _buildDataObject()
707 707
 		{
708 708
 			$offset = ($i - 1) * $this->limit;
709 709
 
710  
-			// Set the empty for removal from route
711  
-			// @todo remove code: $offset = $offset == 0 ? '' : $offset;
712  
-
713 710
 			$data->pages[$i] = new JPaginationObject($i, $this->prefix);
714 711
 			if ($i != $this->pagesCurrent || $this->viewall)
715 712
 			{
716 713
 				$data->pages[$i]->base = $offset;
717 714
 				$data->pages[$i]->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $offset);
718 715
 			}
719  
-			elseif ($i = $this->pagesCurrent)
  716
+			else
720 717
 			{
721 718
 				$data->pages[$i]->active = true;
722 719
 			}

0 notes on commit 5da2f90

Please sign in to comment.
Something went wrong with that request. Please try again.