Skip to content
This repository
Browse code

FIXED: Issue where links within the CMS page list view would not be c…

…orrectly generated. E.g. when the translatable module is used, page links for the "show children" action would come up as admin/pages/?locale=en_NZ?ParentID=21&view=list when they should be shows as admin/pages/?locale=en_NZ&ParentID=21&view=list. Uses Controller::join_links to perform the necessary sanity check on urls.
  • Loading branch information...
commit a6087f1d4eccc8cdf795a215d32472b66258d889 1 parent 342ecd9
Damian Mooyman authored August 08, 2012

Showing 1 changed file with 2 additions and 3 deletions. Show diff stats Hide diff stats

  1. 5  code/controllers/CMSMain.php
5  code/controllers/CMSMain.php
@@ -710,9 +710,8 @@ public function ListViewForm() {
710 710
 				$num = $item ? $item->numChildren() : null;
711 711
 				if($num) {
712 712
 					return sprintf(
713  
-						'<a class="cms-panel-link list-children-link" data-pjax-target="ListViewForm,Breadcrumbs" href="%s?ParentID=%d&view=list">%s</a>',
714  
-						$controller->Link(),
715  
-						$item->ID,
  713
+						'<a class="cms-panel-link list-children-link" data-pjax-target="ListViewForm,Breadcrumbs" href="%s">%s</a>',
  714
+						Controller::join_links($controller->Link(), "?ParentID={$item->ID}&view=list"),
716 715
 						$num
717 716
 					);
718 717
 				}

0 notes on commit a6087f1

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