Skip to content

Commit

Permalink
[5.0] merge conflict fix
Browse files Browse the repository at this point in the history
This code was removed in joomla#34060 and was accidentally brought back in joomla#34118

The code cannot be used anywhere as _buildQuery does not exist
  • Loading branch information
brianteeman committed Oct 18, 2023
1 parent c2125b7 commit 1c42ff9
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions components/com_content/src/Model/ArchiveModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,33 +130,6 @@ protected function getListQuery()
return $query;
}

/**
* Method to get the archived article list
*
* @access public
* @return array
*/
public function getData()
{
$app = Factory::getApplication();

// Lets load the content if it doesn't already exist
if (empty($this->_data)) {
// Get the page/component configuration
$params = $app->getParams();

// Get the pagination request variables
$limit = $app->getInput()->get('limit', $params->get('display_num', 20), 'uint');
$limitstart = $app->getInput()->get('limitstart', 0, 'uint');

$query = $this->_buildQuery();

$this->_data = $this->_getList($query, $limitstart, $limit);
}

return $this->_data;
}

/**
* Gets the archived articles years
*
Expand Down

0 comments on commit 1c42ff9

Please sign in to comment.