[BUGFIX] Fix redirect after page/content move 65/56165/4
authorMathias Brodala <mbrodala@pagemachine.de>
Thu, 15 Mar 2018 13:26:35 +0000 (14:26 +0100)
committerTymoteusz Motylewski <t.motylewski@gmail.com>
Thu, 15 Mar 2018 14:54:59 +0000 (15:54 +0100)
Change-Id: Ic72670657631c6f0ae792be4bcbd76fa63c0ac33
Resolves: #84292
Releases: master
Reviewed-on: https://review.typo3.org/56165
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Simon Gilli <typo3@gilbertsoft.org>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
typo3/sysext/backend/Classes/Tree/View/PageMovingPagePositionMap.php
typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
typo3/sysext/backend/Classes/View/PageLayoutView.php

index 98b027c..10040dd 100644 (file)
@@ -47,7 +47,7 @@ class PageMovingPagePositionMap extends PagePositionMap
         $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
         return 'window.location.href=' . GeneralUtility::quoteJSvalue((string)$uriBuilder->buildUriFromRoute('tce_db', [
             'cmd[pages][' . $GLOBALS['SOBE']->moveUid . '][' . $this->moveOrCopy . ']' => $pid,
-            'redirect' => rawurlencode($this->R_URI)
+            'redirect' => $this->R_URI,
         ])) . ';return false;';
     }
 
index 7866d87..4c26a15 100644 (file)
@@ -574,13 +574,13 @@ class PagePositionMap
         if (is_array($row)) {
             $location = $uriBuilder->buildUriFromRoute('tce_db', [
                 'cmd[tt_content][' . $moveUid . '][' . $this->moveOrCopy . ']' => '-' . $row['uid'],
-                'redirect' => rawurlencode($this->R_URI)
+                'redirect' => $this->R_URI,
             ]);
         } else {
             $location = $uriBuilder->buildUriFromRoute('tce_db', [
                 'cmd[tt_content][' . $moveUid . '][' . $this->moveOrCopy . ']' => $pid,
                 'data[tt_content][' . $moveUid . '][colPos]' => $vv,
-                'redirect' => rawurlencode($this->R_URI)
+                'redirect' => $this->R_URI,
             ]);
         }
         // returns to prev. page
index 4f47504..b393304 100644 (file)
@@ -2467,7 +2467,7 @@ class PageLayoutView implements LoggerAwareInterface
                 'colPos' => $colPos,
                 'sys_language_uid' => $sys_language,
                 'uid_pid' => $id,
-                'returnUrl' => rawurlencode(GeneralUtility::getIndpEnv('REQUEST_URI'))
+                'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
             ]);
             $onClick = 'window.location.href=' . GeneralUtility::quoteJSvalue((string)$url) . ';';
         } else {