Fixed bug #13059: overriden user settings are not visible to the user (Thanks to...
authorBenni Mack <benni.mack@typo3.org>
Wed, 23 Dec 2009 12:53:26 +0000 (12:53 +0000)
committerBenni Mack <benni.mack@typo3.org>
Wed, 23 Dec 2009 12:53:26 +0000 (12:53 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6690 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/setup/mod/index.php

index 93e3d47..3d6df55 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-23  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #13059: overriden user settings are not visible to the user (Thanks to Georg Ringer)
+
 2009-12-21  Benjamin Mack  <benni@typo3.org>
 
        * Fixed bug #12505: JSMENU's showActive is broken (Thanks to Joerg Wagner)
index 8bd0f7f..92ed563 100755 (executable)
@@ -512,6 +512,9 @@ class SC_mod_user_setup_index {
                        if ($style) {
                                $more .= ' style="' . $style . '"';
                        }
+                       if ($this->overrideConf[$fieldName]) {
+                               $more .= ' disabled="disabled"';
+                       }
 
                        $value = $config['table'] == 'be_users' ? $GLOBALS['BE_USER']->user[$fieldName] : $GLOBALS['BE_USER']->uc[$fieldName];
                        if (!$value && isset($config['default'])) {