Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -53,6 +53,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3549084 [edit] Can't enter date directly when editing inline
 - bug #3548491 [interface] Inline query editor doesn't work from search results
 - bug #3547825 [edit] BLOB download no longer works
+- bug #3541966 [config] Error in generated configuration arrray
 
 3.5.2.0 (2012-07-07)
 - bug #3521416 [interface] JS error when editing index

setup/lib/ConfigGenerator.class.php

@@ -142,9 +142,9 @@ class ConfigGenerator
             $ret .= implode(', ', $retv);
         } else {
             // more than 4 values - value per line
-            $imax = count($retv)-1;
-            for ($i = 0; $i <= $imax; $i++) {
-                $ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . '    ' . $retv[$i];
+            $imax = count($retv);
+            for ($i = 0; $i < $imax; $i++) {
+                $ret .= ($i > 0 ? ',' : '') . $crlf . '    ' . $retv[$i];
             }
         }
         $ret .= ')';