Fixed bug #5716: Install tool doesn't take the fileadminDir into account (Thanks...
authorSteffen Kamper <info@sk-typo3.de>
Wed, 13 Jan 2010 23:47:22 +0000 (23:47 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 13 Jan 2010 23:47:22 +0000 (23:47 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6765 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_tstemplate.php
typo3/sysext/install/mod/class.tx_install.php

index 4abd0a2..4535b0b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-01-13  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #5716: Install tool doesn't take the fileadminDir into account (Thanks to Benjamin Mack)
        * Fixed bug #12709: Forgotten flash message in user setup (Thanks to Georg Ringer)
        * Fixed bug #11968: Sporadic random Backend Logoffs / Add X-UA-Compatible flag (Thanks to Steffen Gebert)
        * Fixed bug #12924: Bugfix: t3lib_tcemain checkFullLanguageAccess is too restrictive (Thanks to Tolleiv Nietsch)
index 7ce48ea..5bb1739 100644 (file)
@@ -225,7 +225,7 @@ class t3lib_TStemplate      {
                        // Sets the paths from where TypoScript resources are allowed to be used:
                $this->allowedPaths = Array(
                        'media/',
-                       'fileadmin/',
+                       $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'],      // fileadmin/ path
                        'uploads/',
                        'typo3temp/',
                        't3lib/fonts/',
index 7d988f1..d3b4b2a 100755 (executable)
@@ -1820,8 +1820,8 @@ From sub-directory:
                        'uploads/pics/' => array('Typical location for uploaded files (images especially).',0),
                        'uploads/media/' => array('Typical location for uploaded files (non-images especially).',0),
                        'uploads/tf/' => array('Typical location for uploaded files (TS template resources).',0),
-                       'fileadmin/' => array('Location for local files such as templates, independent uploads etc.',-1),
-                       'fileadmin/_temp_/' => array('Typical temporary location for default upload of files by administrators.',0),
+                       $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] => array('Location for local files such as templates, independent uploads etc.',-1),
+                       $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/' => array('Typical temporary location for default upload of files by administrators.',0),
                );
 
                foreach ($checkWrite as $relpath => $descr)     {