From a6087f1d4eccc8cdf795a215d32472b66258d889 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian.mooyman@gmail.com>
Date: Wed, 8 Aug 2012 17:04:17 +1200
Subject: [PATCH] FIXED: Issue where links within the CMS page list view would
 not be correctly 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.

---
 code/controllers/CMSMain.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 9c00727d..e01e0175 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -710,9 +710,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 				$num = $item ? $item->numChildren() : null;
 				if($num) {
 					return sprintf(
-						'<a class="cms-panel-link list-children-link" data-pjax-target="ListViewForm,Breadcrumbs" href="%s?ParentID=%d&view=list">%s</a>',
-						$controller->Link(),
-						$item->ID,
+						'<a class="cms-panel-link list-children-link" data-pjax-target="ListViewForm,Breadcrumbs" href="%s">%s</a>',
+						Controller::join_links($controller->Link(), "?ParentID={$item->ID}&view=list"),
 						$num
 					);
 				}