From: Dmitry Dulepov <dmitry.dulepov@gmail.com>
Date: Wed, 13 Aug 2008 07:31:40 +0000 (+0000)
Subject: Fixed bug #9063: Feature: Make Position of Editpanel more flexible
X-Git-Tag: TYPO3_4-3-0alpha1~269
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/581561c6d139b05c54ac5fa1d0da627e46e1796f

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 dfbf9ff6452a..92cacd8b3102 100755
--- 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
diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 80a08bfedbc8..2c71fb469631 100755
--- 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.']);
-					$finalOut = $content.$panel;
+					if ($conf['printBeforeContent']) {
+						$finalOut = $panel . $content;
+					} else {
+						$finalOut = $content . $panel;
+					}
 				break;
 			}