Follow-up to #12326: $label is already used, rename new variable to $optionLabel

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

diff --git a/ChangeLog b/ChangeLog
index 4e92a85..c7f287f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-28  Christian Kuhn  <lolli@schwarzbu.ch>
+
+       * Follow-up to #12326: $label is already used, rename new variable to $optionLabel
+
 2009-10-28  Dmitry Dulepov  <dmitry.dulepov@gmail.com>
 
        * Fixed bug #9795: Default values have no labels in the multiple select control inside the flexform

diff --git a/typo3/sysext/setup/mod/index.php b/typo3/sysext/setup/mod/index.php
index d18ef16..aa55d05 100755 (executable)
--- a/typo3/sysext/setup/mod/index.php
+++ b/typo3/sysext/setup/mod/index.php
@@ -561,10 +561,10 @@ class SC_mod_user_setup_index {
                                                $html = t3lib_div::callUserFunction($config['itemsProcFunc'], $config, $this, '');
                                        } else {
                                                $html = '<select id="field_' . $fieldName . '" name="data[' . $fieldName . ']"' . $more . '>' . chr(10);
-                                               foreach ($config['items'] as $key => $label) {
+                                               foreach ($config['items'] as $key => $optionLabel) {
                                                        $html .= '<option value="' . $key . '"' .
                                                                ($value == $key ? ' selected="selected"' : '') .
-                                                               '>' . $this->getLabel($label,'',false) . '</option>' . chr(10);
+                                                               '>' . $this->getLabel($optionLabel, '', false) . '</option>' . chr(10);
                                                }
                                                $html .= '</select>';
                                        }