diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-09 10:39:17 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-09 10:39:17 +0100 |
| commit | b8636ab961a195ab451942865b11c96856436e91 (patch) | |
| tree | f3b715329565dd5c6ed9ad140aeeef43796f8384 /phpBB/phpbb | |
| parent | 5b7178badfb3d06d484e9cebf535f9c9b0cf2cb6 (diff) | |
| parent | 8e64652d80d181be6197465c7a98b13f712a5fa8 (diff) | |
| download | forums-b8636ab961a195ab451942865b11c96856436e91.tar forums-b8636ab961a195ab451942865b11c96856436e91.tar.gz forums-b8636ab961a195ab451942865b11c96856436e91.tar.bz2 forums-b8636ab961a195ab451942865b11c96856436e91.tar.xz forums-b8636ab961a195ab451942865b11c96856436e91.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 96386f6d04..c3c3602944 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -271,7 +271,7 @@ class version_helper { foreach ($branches as $branch => $branch_data) { - $info[$stability][$branch]['announcement'] = str_replace('&', '&', $branch_data['announcement']); + $info[$stability][$branch]['announcement'] = (!empty($branch_data['announcement'])) ? str_replace('&', '&', $branch_data['announcement']) : ''; } } |