aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/admin.php6
-rw-r--r--phpBB/language/en/common.php4
-rw-r--r--phpBB/language/en/gcp.php2
-rw-r--r--phpBB/language/en/mcp.php2
-rw-r--r--phpBB/language/en/memberlist.php2
-rw-r--r--phpBB/language/en/posting.php2
-rw-r--r--phpBB/language/en/search.php2
-rw-r--r--phpBB/language/en/ucp.php2
-rw-r--r--phpBB/language/en/viewforum.php2
-rw-r--r--phpBB/language/en/viewtopic.php2
10 files changed, 15 insertions, 11 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index 04da22fe58..6871b738c4 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
@@ -1757,6 +1757,10 @@ $lang += array(
'SUCCESS_EXTENSION_GROUP_EDIT' => 'Extension Group successfully updated',
'EXTENSION_GROUP_EXIST' => 'The Extension Group %s already exist',
'EXTENSION_GROUP_DELETED' => 'Extension Group successfully deleted',
+ 'ALLOWED_FORUMS' => 'Allowed Forums',
+ 'ALLOWED_FORUMS_EXPLAIN' => 'Able to post the assigned extensions at the following forums',
+ 'ALLOW_ALL_FORUMS' => 'Allow All Forums',
+ 'ALLOW_SELECTED_FORUMS' => 'Only Forums selected below',
'CAT_IMAGES' => 'Images',
'CAT_WM_FILES' => 'Win Media Streams',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 880e6976c4..a2483ec7a3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
@@ -89,7 +89,7 @@ $lang += array(
'EMAIL' => 'Email',
'EMAIL_ADDRESS' => 'Email address',
'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.',
- 'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <b>%s</b> has been deactivated and can no longer be displayed.',
+ 'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <b>%s</b> has been deactivated and can no longer be displayed',
'FAQ' => 'FAQ',
'FILENAME' => 'Filename',
diff --git a/phpBB/language/en/gcp.php b/phpBB/language/en/gcp.php
index a1c2849dcc..f5ff081f5c 100644
--- a/phpBB/language/en/gcp.php
+++ b/phpBB/language/en/gcp.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 67f1747717..b694d1b39e 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 5260ff38ef..c531c5e539 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index ecfaa4eba9..1d673cf4f6 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 8af62635d3..34052cc0d4 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7152458419..8925bfc5ab 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 8587e39ced..26eb392ebf 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 6729edf1e6..3262803206 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -12,7 +12,7 @@
// -------------------------------------------------------------
// DO NOT CHANGE
-if (empty($lang))
+if (empty($lang) || !is_array($lang))
{
$lang = array();
}