+
+2008-11-01 Martin Kutschker <masi@typo3.org>
+
+ * Fixed bug #8715: non-admins can not import pages from their own directory (thanks to Johannes Pieper)
+
2008-11-01 Oliver Hader <oliver@typo3.org>
* Added feature #6637: Integrate possibility to reverse order of rootline HMENU (thanks to Ralf Hettinger)
// OUTPUT creation:
$menuItems = array();
+ // Make input selector:
+ $path = $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']; // must have trailing slash.
+ $filesInDir = t3lib_div::getFilesInDir(PATH_site.$path, 't3d,xml', 1, 1);
+
+ $userPath = $this->userSaveFolder(); //Files from User-Dir
+ $filesInUserDir = t3lib_div::getFilesInDir($userPath, 't3d,xml', 1, 1);
+
+ $filesInDir = array_merge($filesInUserDir, $filesInDir);
- // Make input selector:
- $path = 'fileadmin/'; // must have trailing slash.
- $filesInDir = t3lib_div::getFilesInDir(PATH_site.$path,'t3d,xml',1,1);
if (is_dir(PATH_site.$path.'export/')) {
- $filesInDir = array_merge($filesInDir, t3lib_div::getFilesInDir(PATH_site.$path.'export/','t3d,xml',1,1));
+ $filesInDir = array_merge($filesInDir, t3lib_div::getFilesInDir(PATH_site . $path . 'export/', 't3d,xml', 1, 1));
}
$tempFolder = $this->userTempFolder();
if ($tempFolder) {
- $temp_filesInDir = t3lib_div::getFilesInDir($tempFolder,'t3d,xml',1,1);
+ $temp_filesInDir = t3lib_div::getFilesInDir($tempFolder, 't3d,xml', 1, 1);
$filesInDir = array_merge($filesInDir, $temp_filesInDir);
}