[FOLLOWUP][BUGFIX] Fetching configuration-comments should require no comma 46/50446/2
authorMarkus Klein <markus.klein@typo3.org>
Mon, 31 Oct 2016 02:29:39 +0000 (03:29 +0100)
committerMarkus Klein <markus.klein@typo3.org>
Mon, 31 Oct 2016 02:30:33 +0000 (03:30 +0100)
Fix regex to capture description correctly.

Resolves: #78333
Releases: master, 7.6
Change-Id: I8b731c2e1c2a4e9e3d1fdf01823bbefadee367fb
Reviewed-on: https://review.typo3.org/50446
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/install/Classes/Controller/Action/Tool/AllConfiguration.php

index 40c7513..997b885 100644 (file)
@@ -206,7 +206,7 @@ class AllConfiguration extends Action\AbstractAction
                 if ($lc === '];') {
                     break;
                 }
-                if (preg_match('#["\']([\\w_-]*)["\']\\s*=>\\s*(?:(\\[).*|(?!//).*//\\s*(.*))#i', $lc, $reg)) {
+                if (preg_match('#["\']([\\w_-]*)["\']\\s*=>\\s*(?:(\\[).*|(?:(?!//).)*//\\s*(.*))#i', $lc, $reg)) {
                     if ($reg[2] === '[' && $reg[1] === strtoupper($reg[1])) {
                         $mainKey = $reg[1];
                     } elseif ($mainKey) {