Fixed bug #10064: config.admPanel has no effect (thanks to Ralf Hettinger)

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

diff --git a/ChangeLog b/ChangeLog
index 6858496..1bde61c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Jeff Segars <jeff@webempoweredchurch.org>
+
+       * Fixed bug #10064: config.admPanel has no effect (thanks to Ralf Hettinger)
+

 2009-01-14  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10138: htmlArea RTE: add Clear RTE cache option to BE Clear cache menu
 2009-01-14  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10138: htmlArea RTE: add Clear RTE cache option to BE Clear cache menu

diff --git a/t3lib/class.t3lib_frontendedit.php b/t3lib/class.t3lib_frontendedit.php
index b833508..2e752d3 100644 (file)
--- a/t3lib/class.t3lib_frontendedit.php
+++ b/t3lib/class.t3lib_frontendedit.php
@@ -135,7 +135,7 @@ class t3lib_frontendedit {
        public function displayAdmin() {
                $content = '';
                $adminClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/classes/class.frontendedit.php']['admin'];
        public function displayAdmin() {
                $content = '';
                $adminClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/classes/class.frontendedit.php']['admin'];

-               if ($adminClass && !$GLOBALS['BE_USER']->extAdminConfig['hide']) {
+               if ($adminClass && !$GLOBALS['BE_USER']->extAdminConfig['hide'] && $GLOBALS['TSFE']->config['config']['admPanel']) {

                        $admin = &t3lib_div::getUserObj($adminClass);
                        if (is_object($admin)) {
                                $content =  $admin->display();
                        $admin = &t3lib_div::getUserObj($adminClass);
                        if (is_object($admin)) {
                                $content =  $admin->display();