Fixed bug #9019: CSH in file_upload module is not in docheader

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3901 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 09c2eeb..c01a8c0 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-22  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #9019: CSH in file_upload module is not in docheader 
+
 2008-07-21  Benjamin Mack  <benni@typo3.org>
 
        * Fixed bug #8534: Backend Login is now template-able

diff --git a/typo3/file_upload.php b/typo3/file_upload.php
index 0cdef6f..960c700 100755 (executable)
--- a/typo3/file_upload.php
+++ b/typo3/file_upload.php
@@ -243,15 +243,15 @@ class SC_file_upload {
                        </div>
                ';
 
-                       // CSH:
-               $code.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_upload', $GLOBALS['BACK_PATH'],'<br/>');
-
                        // Add the HTML as a section:
                $pageContent.= $this->doc->section('',$code);
 
-               $docHeaderButtons = array();
 
-                       // Add the HTML as a section:
+                       // Header Buttons
+               $docHeaderButtons = array(
+                       'csh' => t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'file_upload', $GLOBALS['BACK_PATH'])
+               );
+
                $markerArray = array(
                        'CSH' => $docHeaderButtons['csh'],
                        'FUNC_MENU' => t3lib_BEfunc::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']),
@@ -295,4 +295,4 @@ $SOBE = t3lib_div::makeInstance('SC_file_upload');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>

diff --git a/typo3/templates/file_upload.html b/typo3/templates/file_upload.html
index 57242da..1548908 100644 (file)
--- a/typo3/templates/file_upload.html
+++ b/typo3/templates/file_upload.html
@@ -7,7 +7,7 @@
                        <div class="buttonsright">###BUTTONLIST_RIGHT###</div>
                </div>
                <div id="typo3-docheader-row2">
-                       <div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+                       <div class="docheader-row2-left"><div class="docheader-csh">###CSH###</div><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
                        <div class="docheader-row2-right">###PATH###</div>
                </div>
        </div>