aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-09 10:38:48 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-09 10:38:48 +0100
commit8e64652d80d181be6197465c7a98b13f712a5fa8 (patch)
tree25f702c75c1d1bcf12ed48e75d15bd49194e62f0
parent101945acf98b7fb765a90288bc7dd403ee610dd5 (diff)
parent3fba5e317adefce4814e49ee6a3c6b80f79bafe9 (diff)
downloadforums-8e64652d80d181be6197465c7a98b13f712a5fa8.tar
forums-8e64652d80d181be6197465c7a98b13f712a5fa8.tar.gz
forums-8e64652d80d181be6197465c7a98b13f712a5fa8.tar.bz2
forums-8e64652d80d181be6197465c7a98b13f712a5fa8.tar.xz
forums-8e64652d80d181be6197465c7a98b13f712a5fa8.zip
Merge pull request #3119 from Elsensee/ticket/13243
[ticket/13243] Validate announcement entry for existence in version_helper
-rw-r--r--phpBB/phpbb/version_helper.php2
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('&', '&amp;', $branch_data['announcement']);
+ $info[$stability][$branch]['announcement'] = (!empty($branch_data['announcement'])) ? str_replace('&', '&amp;', $branch_data['announcement']) : '';
}
}