diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-08-13 16:15:39 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-08-13 16:15:39 +0200 |
| commit | 1e605efaf126f5474bb1be99e7fdaed834ebb2a0 (patch) | |
| tree | 0525e84479c521140ee0097640ce1ea62dcaddd9 | |
| parent | 46684228d5d8cfdddf29a2a97aad2ee66e47f603 (diff) | |
| parent | 80d0bf4566c098364790473d6b1c63aa3167922b (diff) | |
| download | forums-1e605efaf126f5474bb1be99e7fdaed834ebb2a0.tar forums-1e605efaf126f5474bb1be99e7fdaed834ebb2a0.tar.gz forums-1e605efaf126f5474bb1be99e7fdaed834ebb2a0.tar.bz2 forums-1e605efaf126f5474bb1be99e7fdaed834ebb2a0.tar.xz forums-1e605efaf126f5474bb1be99e7fdaed834ebb2a0.zip | |
Merge pull request #4877 from JoshyPHP/ticket/15291
[ticket/15291] Allow short array notation in event declarations
| -rw-r--r-- | phpBB/phpbb/event/php_exporter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php index ae3553c558..26d7e2b426 100644 --- a/phpBB/phpbb/event/php_exporter.php +++ b/phpBB/phpbb/event/php_exporter.php @@ -392,7 +392,7 @@ class php_exporter public function get_vars_from_single_line_array($line, $throw_multiline = true) { $match = array(); - preg_match('#^\$vars = array\(\'([a-zA-Z0-9_\' ,]+)\'\);$#', $line, $match); + preg_match('#^\$vars = (?:\[|array\()\'([a-zA-Z0-9_\' ,]+)\'[\)\]];$#', $line, $match); if (isset($match[1])) { |