Fixed bug #10735: Wrong returnUrl with clipboard actions
authorSteffen Kamper <info@sk-typo3.de>
Thu, 16 Apr 2009 16:17:31 +0000 (16:17 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Thu, 16 Apr 2009 16:17:31 +0000 (16:17 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5323 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_clipboard.php

index f91cba0..7fa9294 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-16  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #10735: Wrong returnUrl with clipboard actions
+
 2009-04-15  Tobias Liebig <mail_typo3@etobi.de>
 
        * Fixed issue #8103: t3editor / typoscript on the right side of an operator is not tokenized (needed to enable codecompletion behind copy or reference operator)
 2009-04-15  Tobias Liebig <mail_typo3@etobi.de>
 
        * Fixed issue #8103: t3editor / typoscript on the right side of an operator is not tokenized (needed to enable codecompletion behind copy or reference operator)
index aad744c..6bf5f76 100644 (file)
@@ -338,18 +338,18 @@ class t3lib_clipboard {
                }
                                // Edit:
                if (!$this->fileMode && $elCount)       {
                }
                                // Edit:
                if (!$this->fileMode && $elCount)       {
-                       $opt[]='<option value="' . htmlspecialchars("window.location.href='" . $this->editUrl() . "&returnUrl='+top.rawurlencodeAndRemoveSiteUrl(window.location.href);") . '">' . $this->clLabel('edit', 'rm') . '</option>';
+                       $opt[]='<option value="' . htmlspecialchars("window.location.href='" . $this->editUrl() . "&returnUrl='+top.rawurlencode(window.location.href);") . '">' . $this->clLabel('edit', 'rm') . '</option>';
                }
                                // Delete:
                if ($elCount)   {
                        if($GLOBALS['BE_USER']->jsConfirmation(4))      {
                                $js = "
                        if(confirm(".$GLOBALS['LANG']->JScharCode(sprintf($LANG->sL('LLL:EXT:lang/locallang_core.php:mess.deleteClip'),$elCount)).")){
                }
                                // Delete:
                if ($elCount)   {
                        if($GLOBALS['BE_USER']->jsConfirmation(4))      {
                                $js = "
                        if(confirm(".$GLOBALS['LANG']->JScharCode(sprintf($LANG->sL('LLL:EXT:lang/locallang_core.php:mess.deleteClip'),$elCount)).")){
-                               window.location.href='" . $this->deleteUrl(0, $this->fileMode ? 1 : 0) . "&redirect='+top.rawurlencodeAndRemoveSiteUrl(window.location.href);
+                               window.location.href='" . $this->deleteUrl(0, $this->fileMode ? 1 : 0) . "&redirect='+top.rawurlencode(window.location.href);
                        }
                                        ";
                        } else {
                        }
                                        ";
                        } else {
-                               $js = " window.location.href='" . $this->deleteUrl(0, $this->fileMode ? 1 : 0) . "&redirect='+top.rawurlencodeAndRemoveSiteUrl(window.location.href); ";
+                               $js = " window.location.href='" . $this->deleteUrl(0, $this->fileMode ? 1 : 0) . "&redirect='+top.rawurlencode(window.location.href); ";
                        }
                        $opt[]='<option value="'.htmlspecialchars($js).'">'.$this->clLabel('delete','rm').'</option>';
                }
                        }
                        $opt[]='<option value="'.htmlspecialchars($js).'">'.$this->clLabel('delete','rm').'</option>';
                }