Merge pull request #1444 from fabrixxm/issue-1341

fix paginate url
This commit is contained in:
Michael Vogel 2015-03-23 15:19:35 +01:00
commit 3d297c065e

View file

@ -270,7 +270,7 @@ if(! function_exists('paginate_data')) {
* @return Array data for pagination template * @return Array data for pagination template
*/ */
function paginate_data(&$a, $count=null) { function paginate_data(&$a, $count=null) {
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); $stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
$stripped = str_replace('q=','',$stripped); $stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/'); $stripped = trim($stripped,'/');