Fixed bug #9063: Feature: Make Position of Editpanel more flexible

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

diff --git a/ChangeLog b/ChangeLog
index dfbf9ff..92cacd8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-12  Dmitry Dulepov  <dmotry@typo3.org>
+
+       * Fixed bug #9063: Feature: Make Position of Editpanel more flexible
+

 2008-08-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8988: htmlArea RTE: Pasting text from MS Word to Firefox 3 brings a lot of garbage
 2008-08-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8988: htmlArea RTE: Pasting text from MS Word to Firefox 3 brings a lot of garbage

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 80a08bf..2c71fb4 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -7214,7 +7214,11 @@ class tslib_cObj {
                                                // wrap the complete panel
                                        if ($conf['outerWrap']) $panel = $this->wrap($panel,$conf['outerWrap']);
                                        if ($conf['outerWrap.']) $panel = $this->stdWrap($panel,$conf['outerWrap.']);
                                                // wrap the complete panel
                                        if ($conf['outerWrap']) $panel = $this->wrap($panel,$conf['outerWrap']);
                                        if ($conf['outerWrap.']) $panel = $this->stdWrap($panel,$conf['outerWrap.']);

-                                       $finalOut = $content.$panel;
+                                       if ($conf['printBeforeContent']) {
+                                               $finalOut = $panel . $content;
+                                       } else {
+                                               $finalOut = $content . $panel;
+                                       }

                                break;
                        }
 
                                break;
                        }