Fixed bug: #1897: Basic Configuration uses different scheme to write im_path to local...

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

diff --git a/ChangeLog b/ChangeLog
index e5f4c67..afde12c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-07  Oliver Hader  <oliver@typo3.org>
+
+       * Fixed bug: #1897: Basic Configuration uses different scheme to write im_path to localconf.php
+
 2008-08-07  Ingo Renner  <ingo@typo3.org>
 
        * Added Feature #8515: Speed up tslib_cObj->getTreeList by caching its results

diff --git a/typo3/sysext/install/mod/class.tx_install.php b/typo3/sysext/install/mod/class.tx_install.php
index ad2dc42..3a031b1 100755 (executable)
--- a/typo3/sysext/install/mod/class.tx_install.php
+++ b/typo3/sysext/install/mod/class.tx_install.php
@@ -2187,13 +2187,15 @@ From sub-directory:
                                                        case 'gdlib':
                                                        case 'gdlib_png':
                                                        case 'im':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key],$value))    $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\']["'.$key.'"]', $value?1:0);
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key], $value)) {
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'' . $key . '\']', ($value ? 1 : 0));
+                                                               }
                                                        break;
                                                        case 'im_path':
                                                                list($value,$version) = explode('|',$value);
                                                                if (!ereg('[[:space:]]',$value,$reg) && strlen($value)<100)     {
-                                                                       if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key],$value))    {
-                                                                               $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\']["'.$key.'"]', $value);
+                                                                       if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key], $value)) {
+                                                                               $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'' . $key . '\']', $value);
                                                                        }
                                                                        if(doubleval($version)>0 && doubleval($version)<4)      {       // Assume GraphicsMagick
                                                                                $value_ext = 'gm';
@@ -2211,7 +2213,9 @@ From sub-directory:
                                                        case 'im_path_lzw':
                                                                list($value) = explode('|',$value);
                                                                if (!ereg('[[:space:]]',$value) && strlen($value)<100)  {
-                                                                       if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key],$value))    $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\']["'.$key.'"]', $value);
+                                                                       if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key], $value)) {
+                                                                               $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'' . $key . '\']', $value);
+                                                                       }
                                                                } else $this->messages[]= $errorMessages[] = "Path '".$value."' contains spaces or is longer than 100 chars (...not saved)";
                                                        break;
                                                        case 'TTFdpi':