Added feature #16345: User Tools>User settings: get csh from any specified csh file

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

diff --git a/ChangeLog b/ChangeLog
index a4cbfbc..5ea2cc8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-11-11  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #16314: Incorrect use of is_dir in class.tx_rtehtmlarea_clearrtecache.php (Thanks to Juergen Deisenroth)
+       * Added feature #16345: User Tools>User settings: get csh from any specified csh file
 
 2010-11-11  Christian Kuhn  <lolli@schwarzbu.ch>
 

diff --git a/typo3/sysext/setup/mod/index.php b/typo3/sysext/setup/mod/index.php
index caf49b2..1401b52 100755 (executable)
--- a/typo3/sysext/setup/mod/index.php
+++ b/typo3/sysext/setup/mod/index.php
@@ -924,12 +924,18 @@ class SC_mod_user_setup_index {
         * @return      string          HTML output.
         */
        protected function getCSH($str, $label) {
-               if (!t3lib_div::inList('language,simuser', $str)) {
-                       $str = 'option_' . $str;
-               }
-               return t3lib_BEfunc::wrapInHelp('_MOD_user_setup', $str, $label);
+               $context = '_MOD_user_setup';
+               $field = $str;
+               $strParts = explode(':', $str);
+               if (count($strParts) > 1) {
+                               // Setting comes from another extension
+                       $context = $strParts[0];
+                       $field = $strParts[1];
+               } else if (!t3lib_div::inList('language,simuser', $str)) {
+                       $field = 'option_' . $str;
+               }
+               return t3lib_BEfunc::wrapInHelp($context, $field, $label);
        }
-
        /**
         * Returns array with fields defined in $GLOBALS['TYPO3_USER_SETTINGS']['showitem']
         *