Merge pull request #3343 from splitbrain/bug3271

work around disabled php_strip_whitespace. fixes #3271
2020-12-03 19:57:44 +01:00 · 2020-12-03 19:57:44 +01:00 · bae9e2a144
parent 1203daccf5 571a8adbb8
commit bae9e2a144
1 changed files with 8 additions and 0 deletions
--- a/lib/plugins/config/core/ConfigParser.php
+++ b/lib/plugins/config/core/ConfigParser.php
@ -29,6 +29,14 @@ class ConfigParser {

        $config = array();
        $contents = @php_strip_whitespace($file);
+
+        // fallback to simply including the file #3271
+        if($contents === null) {
+            $conf = [];
+            include $file;
+            return $conf;
+        }
+
        $pattern = '/\$' . $this->varname . '\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$' . $this->varname . '|$))/s';
        $matches = array();
        preg_match_all($pattern, $contents, $matches, PREG_SET_ORDER);