diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 15:21:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 21:48:20 +0100 |
| commit | f27cdad73e7a4af913414522d85855136bf50b31 (patch) | |
| tree | 33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/phpbb | |
| parent | 59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff) | |
| parent | 45199adebdfc00f436a719de1c5772429367b756 (diff) | |
| download | forums-f27cdad73e7a4af913414522d85855136bf50b31.tar forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.gz forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.bz2 forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.xz forums-f27cdad73e7a4af913414522d85855136bf50b31.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/event/php_exporter.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php index d2ab0595c0..ae3553c558 100644 --- a/phpBB/phpbb/event/php_exporter.php +++ b/phpBB/phpbb/event/php_exporter.php @@ -510,7 +510,7 @@ class php_exporter /** * Find the "@changed" Information lines * - * @param string $tag_name Should be 'changed' or 'change' + * @param string $tag_name Should be 'change', not 'changed' * @return array Absolute line numbers * @throws \LogicException */ @@ -658,7 +658,7 @@ class php_exporter { $match = array(); $line = str_replace("\t", ' ', ltrim($line, "\t ")); - preg_match('#^\* @change(d)? (\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?)( (?:.*))?$#', $line, $match); + preg_match('#^\* @changed (\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?)( (?:.*))?$#', $line, $match); if (!isset($match[2])) { throw new \LogicException("Invalid '@changed' information for event " |