aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-04 17:44:07 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-04 17:44:07 +0100
commit3d93fd40edb627dafeede3b5ae3780885e2264fe (patch)
treeb6aaad7cebd68a5fa4819f5ea59bccbfaae6c354 /phpBB/language
parentf2c4bf176d7aaa18f143894643851a73cfd7df06 (diff)
parentdd89a369f3166ed4a3730ac8a2fb6eb5608ac284 (diff)
downloadforums-3d93fd40edb627dafeede3b5ae3780885e2264fe.tar
forums-3d93fd40edb627dafeede3b5ae3780885e2264fe.tar.gz
forums-3d93fd40edb627dafeede3b5ae3780885e2264fe.tar.bz2
forums-3d93fd40edb627dafeede3b5ae3780885e2264fe.tar.xz
forums-3d93fd40edb627dafeede3b5ae3780885e2264fe.zip
Merge pull request #4611 from marc1706/ticket/14838
[icket/14838] Do not query full attachments table in feeds
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/common.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a2cfd958aa..b4b328e90d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -336,6 +336,7 @@ $lang = array_merge($lang, array(
'INTERESTS' => 'Interests',
'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge.',
'INVALID_EMAIL_LOG' => '<strong>%s</strong> possibly an invalid email address?',
+ 'INVALID_FEED_ATTACHMENTS' => 'The selected feed tried fetching attachments with invalid constraints.',
'INVALID_PLURAL_RULE' => 'The chosen plural rule is invalid. Valid values are integers between 0 and 15.',
'IP' => 'IP',
'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',