From df51131360a269bbf6da5bf461af120790071be9 Mon Sep 17 00:00:00 2001
From: Steffen Kamper <info@sk-typo3.de>
Date: Tue, 24 Aug 2010 10:43:55 +0000
Subject: [PATCH] Fixed bug #15502: localization links in list mode are brocken
 (Thanks to Bjoern Pedersen)

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8667 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                     | 4 ++++
 typo3/class.db_list.inc       | 3 ++-
 typo3/class.db_list_extra.inc | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dcc3fbc5f30..2f07d42f69f5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-24  Steffen Kamper  <steffen@typo3.org>
+
+	* Fixed bug #15502: localization links in list mode are brocken (Thanks to Bjoern Pedersen)
+
 2010-08-24  Sebastian Kurfuerst  <sebastian@typo3.org>
 
 	* Raised Fluid and Extbase version numbers to 1.3.0alpha1. See ChangeLog.txt in Extbase/Fluid for a full list of changes.
diff --git a/typo3/class.db_list.inc b/typo3/class.db_list.inc
index f791e912f2ee..db4c617e5b32 100644
--- a/typo3/class.db_list.inc
+++ b/typo3/class.db_list.inc
@@ -828,8 +828,9 @@ class recordList extends t3lib_recordList {
 
 			if (is_array($localizedRecord))	{
 					// Create parameters and finally run the classic page module for creating a new page translation
+				$url = substr($this->listURL(), strlen($this->backPath));
 				$params = '&edit['.$table.']['.$localizedRecord['uid'].']=edit';
-				$returnUrl = '&returnUrl='.rawurlencode($this->listURL());
+				$returnUrl = '&returnUrl='.rawurlencode($url);
 				$location = $GLOBALS['BACK_PATH'].'alt_doc.php?'.$params.$returnUrl;
 
 				t3lib_utility_Http::redirect($location);
diff --git a/typo3/class.db_list_extra.inc b/typo3/class.db_list_extra.inc
index e0e6859d7956..bb189be045f6 100644
--- a/typo3/class.db_list_extra.inc
+++ b/typo3/class.db_list_extra.inc
@@ -1570,9 +1570,10 @@ class localRecordList extends recordList {
 			$lNew = '';
 			foreach($this->pageOverlays as $lUid_OnPage => $lsysRec)	{
 				if (!isset($translations['translations'][$lUid_OnPage]) && $GLOBALS['BE_USER']->checkLanguageAccess($lUid_OnPage))	{
-					$href = $this->backPath . $GLOBALS['TBE_TEMPLATE']->issueCommand(
-						'&cmd['.$table.']['.$row['uid'].'][localize]='.$lUid_OnPage,
-						$this->listURL().'&justLocalized='.rawurlencode($table.':'.$row['uid'].':'.$lUid_OnPage)
+					$url = substr($this->listURL(), strlen($this->backPath));
+					$href = $GLOBALS['SOBE']->doc->issueCommand(
+						'&cmd[' . $table . '][' . $row['uid'] . '][localize]=' . $lUid_OnPage,
+						$url . '&justLocalized=' . rawurlencode($table . ':' . $row['uid'] . ':' . $lUid_OnPage)
 					);
 					$language = t3lib_BEfunc::getRecord('sys_language', $lUid_OnPage, 'title');
 					$lC = ($this->languageIconTitles[$lUid_OnPage]['flagIcon'] ? '<img src="'.$this->languageIconTitles[$lUid_OnPage]['flagIcon'].'" class="absmiddle" alt="" />' : $this->languageIconTitles[$lUid_OnPage]['title']);
-- 
2.20.1