MAGETWO-87986: Media Folder Structure for CMS Images

danmooney2 · danmooney2 · commit fe3e9a0e37a0 · 2018-03-19T10:23:19.000-05:00
Use URL-safe base64 decode
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -129,7 +129,7 @@ public function getTreeCurrentPath()
         $treePath = ['root'];
 
         if ($idEncodedPath = $this->getRequest()->getParam('current_tree_path')) {
-            $path = base64_decode($idEncodedPath);
+            $path = $this->_cmsWysiwygImages->idDecode($idEncodedPath);
         } else {
             $path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath();
         }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function getTreeCurrentPath()`
`129`	`129`	`$treePath = ['root'];`
`130`	`130`
`131`	`131`	`if ($idEncodedPath = $this->getRequest()->getParam('current_tree_path')) {`
`132`		`- $path = base64_decode($idEncodedPath);`
	`132`	`+ $path = $this->_cmsWysiwygImages->idDecode($idEncodedPath);`
`133`	`133`	`} else {`
`134`	`134`	`$path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath();`
`135`	`135`	`}`