aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/adm/admin_board.php4
-rw-r--r--phpBB/adm/admin_forums.php6
-rw-r--r--phpBB/adm/admin_permissions.php14
-rw-r--r--phpBB/adm/index.php2
-rw-r--r--phpBB/adm/pagestart.php14
-rw-r--r--phpBB/includes/acm/acm_file.php15
-rw-r--r--phpBB/includes/db/mysql.php10
-rw-r--r--phpBB/language/en/admin.php2
-rw-r--r--phpBB/language/en/common.php9
-rw-r--r--phpBB/language/en/mcp.php5
-rw-r--r--phpBB/language/en/memberlist.php2
-rw-r--r--phpBB/language/en/posting.php2
-rw-r--r--phpBB/language/en/ucp.php27
-rw-r--r--phpBB/language/en/viewforum.php3
14 files changed, 93 insertions, 22 deletions
diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index 86a3ff9772..fff08ad48e 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -80,6 +80,10 @@ switch ($mode)
$l_title = 'MESSAGE_SETTINGS';
$which_auth = 'a_defaults';
break;
+ case 'message':
+ $l_title = 'MESSAGE_SETTINGS';
+ $which_auth = 'a_defaults';
+ break;
default:
return;
}
diff --git a/phpBB/adm/admin_forums.php b/phpBB/adm/admin_forums.php
index fb203999f5..4da3de90f4 100644
--- a/phpBB/adm/admin_forums.php
+++ b/phpBB/adm/admin_forums.php
@@ -75,6 +75,9 @@ if ($update)
delete_forum($forum_id, $action_posts, $action_subforums, $posts_to_id, $subforums_to_id);
+ //
+ $auth->acl_clear_prefetch();
+
trigger_error($user->lang['FORUM_DELETED']);
break;
@@ -118,6 +121,9 @@ if ($update)
break;
}
+ //
+ $auth->acl_clear_prefetch();
+
// Redirect to permissions
$message = ($mode == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED'];
$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], "<a href=\"admin_permissions.$phpEx$SID&amp;mode=forum&amp;submit_usergroups=true&amp;ug_type=forum&amp;action=usergroups&amp;f[forum][]=" . $forum_data['forum_id'] . '">', '</a>');
diff --git a/phpBB/adm/admin_permissions.php b/phpBB/adm/admin_permissions.php
index 7bfed014b4..c8c79960ab 100644
--- a/phpBB/adm/admin_permissions.php
+++ b/phpBB/adm/admin_permissions.php
@@ -308,7 +308,7 @@ switch ($submit)
// Do we need to recache the moderator lists? We do if the mode
// was mod or auth_settings['mod'] is a non-zero size array
- if ($mode == 'mod' || sizeof($auth_settings['mod']))
+ if ($mode == 'mod' || (isset($auth_settings['mod']) && sizeof($auth_settings['mod'])))
{
cache_moderators();
}
@@ -738,7 +738,7 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
// Grab the list of options ... if we're in deps mode we want all options,
// else we skip the master options
- $sql_founder = ($user->data['user_founder']) ? ' AND founder_only <> 1' : '';
+ $sql_founder = ($user->data['user_type'] == USER_FOUNDER) ? ' AND founder_only <> 1' : '';
$sql_limit_option = ($mode == 'deps') ? '' : "AND auth_option <> '" . $sql_option_mode . "_'";
$sql = "SELECT auth_option_id, auth_option
FROM " . ACL_OPTIONS_TABLE . "
@@ -760,6 +760,7 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
// Now we'll build a list of preset options ...
$preset_options = $preset_js = $preset_update_options = '';
$holding = array();
+ $holding['allow'] = $holding['deny'] = $holding['inherit'] = '';
// Do we have a parent forum? If so offer option to inherit from that
if ($forum_data['parent_id'] != 0)
@@ -830,7 +831,7 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
}
$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
- $preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['yes'] . "', '" . $holding['no'] . "', '" . $holding['unset'] . "');\n";
+ $preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
}
while ($row = $db->sql_fetchrow($result));
}
@@ -841,7 +842,7 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
// If we aren't looking @ deps then we try and grab existing sessions for
// the given forum and user/group
- if (empty($auth_settings[$which_mode]))
+ if (!is_array($auth_settings) || empty($auth_settings[$which_mode]))
{
if ($which_mode == $mode)
{
@@ -1141,7 +1142,8 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
</tr>
<?php
- for($i = 0; $i < sizeof($auth_options); $i++)
+ $row_class = 'row2';
+ for ($i = 0; $i < sizeof($auth_options); $i++)
{
$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
@@ -1317,7 +1319,7 @@ adm_page_footer();
//
function update_foes()
{
- global $db;
+ global $db, $auth;
$perms = array();
foreach ($auth->acl_get_list(false, array('a_', 'm_'), false) as $forum_id => $forum_ary)
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 194d8bf979..c1a5004ac1 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -130,7 +130,7 @@ else if ($pane == 'left')
elseif ($pane == 'right')
{
$action = request_var('action', '');
- $mark = implode(', ', request_var('mark', 0));
+ $mark = (isset($_REQUEST['mark'])) ? implode(', ', request_var('mark', 0)) : '';
if ($mark)
{
diff --git a/phpBB/adm/pagestart.php b/phpBB/adm/pagestart.php
index 716d07563f..4621fa67a2 100644
--- a/phpBB/adm/pagestart.php
+++ b/phpBB/adm/pagestart.php
@@ -149,9 +149,9 @@ function adm_page_footer($copyright_html = true)
exit;
}
-function adm_page_message($title, $message, $show_header = false)
+function adm_page_message($title, $message, $show_header = false, $show_prev_info = true)
{
- global $phpEx, $SID, $user;
+ global $phpEx, $SID, $user, $_SERVER, $_ENV;
if ($show_header)
{
@@ -169,6 +169,7 @@ function adm_page_message($title, $message, $show_header = false)
}
+ $page = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : $_ENV['REQUEST_URI'];
?>
<br /><br />
@@ -178,7 +179,14 @@ function adm_page_message($title, $message, $show_header = false)
<th><?php echo $title; ?></th>
</tr>
<tr>
- <td class="row1" align="center"><?php echo $message; ?></td>
+ <td class="row1" align="center"><?php echo $message; ?>
+<?php
+ if ($page && $show_prev_info)
+ {
+ echo '<br /><br />';
+ echo sprintf($user->lang['RETURN_PAGE'], '<a href="' . $page . '">', '</a>');
+ }
+?> </td>
</tr>
</table>
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 229685d431..27a126dc84 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -28,7 +28,14 @@ class acm
function load()
{
global $phpEx;
- @include($this->cache_dir . 'data_global.' . $phpEx);
+ if (file_exists($this->cache_dir . 'data_global.' . $phpEx))
+ {
+ @include($this->cache_dir . 'data_global.' . $phpEx);
+ }
+ else
+ {
+ return false;
+ }
}
function unload()
@@ -230,7 +237,13 @@ class acm
$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
$query_id = 'Cache id #' . count($this->sql_rowset);
+ if (!file_exists($this->cache_dir . 'sql_' . md5($query) . ".$phpEx"))
+ {
+ return false;
+ }
+
@include($this->cache_dir . 'sql_' . md5($query) . ".$phpEx");
+
if (!isset($expired))
{
return FALSE;
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index abfdd576f6..ccaca5e884 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -345,6 +345,16 @@ class sql_db
$query_id = $this->query_result;
}
+ if ($query_id)
+ {
+ // If it is not found within the open queries, we try to free a cached result. ;)
+ if (!(array_search($query_id, $this->open_queries) > 0))
+ {
+ return false;
+ }
+ unset($this->open_queries[array_search($query_id, $this->open_queries)]);
+ }
+
return ($query_id) ? @mysql_free_result($query_id) : false;
}
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index ae6683d754..93f2c3c2fa 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -397,6 +397,8 @@ $lang += array(
'SELECTED_FORUM' => 'Selected Forum',
'SELECTED_FORUMS' => 'Selected Forums',
'WILL_SET_OPTIONS' => 'Will set options in',
+ 'INHERIT_PARENT' => 'Inherit Parent',
+ 'SAVE' => 'Save',
'ACL_VIEW_FORUM' => 'Forum Options',
'ACL_VIEW_MOD' => 'Moderator Options',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 21923710f0..3c6d26ff75 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -210,6 +210,7 @@ $lang += array(
'MONTH' => 'Month',
'MOVE' => 'Move',
+ 'NA' => 'N/A',
'NEWEST_USER' => 'Our newest member <b>%s%s%s</b>',
'NEW_MESSAGE' => 'New Message',
'NEW_MESSAGES' => 'New Messages',
@@ -238,6 +239,8 @@ $lang += array(
'NO_USER' => 'The requested user does not exist.',
'OCCUPATION' => 'Occupation',
+ 'OFFLINE' => 'Offline',
+ 'ONLINE' => 'Online',
'ONLINE_BUDDIES' => 'Online Buddies',
'ONLINE_USERS_TOTAL'=> 'In total there are <b>%d</b> users online :: ',
'ONLINE_USERS_ZERO_TOTAL' => 'In total there are <b>0</b> users online :: ',
@@ -268,6 +271,7 @@ $lang += array(
'READING_FORUM' => 'Viewing topics in %s',
'READING_TOPIC' => 'Reading topic in %s',
+ 'READ_PROFILE' => 'Profile',
'REASON' => 'Reason',
'RECORD_ONLINE_USERS' => 'Most users ever online was <b>%1$s</b> on %2$s',
'REDIRECTS' => 'Total redirects',
@@ -281,10 +285,12 @@ $lang += array(
'REG_USER_TOTAL' => '%d Registered, ',
'REMOVE_INSTALL' => 'Please delete, move or rename the install directory.',
'REPLIES' => 'Replies',
+ 'REPLY_WITH_QUOTE' => 'Reply with quote',
'REPLYING_MESSAGE' => 'Replying to message in %s',
'RESET' => 'Reset',
'RETURN_INDEX' => 'Click %sHere%s to return to the index',
'RETURN_FORUM' => 'Click %sHere%s to return to the forum',
+ 'RETURN_PAGE' => 'Click %sHere%s to return to the previous page',
'RETURN_TOPIC' => 'Click %sHere%s to return to the topic',
'RULES_ATTACH_CAN' => 'You <b>can</b> post attachments in this forum',
'RULES_ATTACH_CANNOT' => 'You <b>cannot</b> post attachments in this forum',
@@ -365,6 +371,7 @@ $lang += array(
'USERNAMES' => 'Usernames',
'USER_POST' => '%d Post',
'USER_POSTS' => '%d Posts',
+ 'USERS' => 'Users',
'VIEWED' => 'Viewed',
'VIEWING_FAQ' => 'Viewing FAQ',
@@ -572,7 +579,6 @@ $unused = array(
'RATING' => 'Rating',
'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement',
'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement',
- 'REPLY_WITH_QUOTE' => 'Reply with quote',
'RESULT_DIR' => 'Order results',
'RETURN_GROUP' => 'Click %sHere%s to return to the Group Control Panel',
'RETURN_LOGIN' => 'Click %sHere%s to try again',
@@ -604,7 +610,6 @@ $unused = array(
'UNWATCHED_FORUMS_TOPICS' => 'You are no longer watching the selected forums or topics.',
'UNWATCHED_TOPICS' => 'You are no longer watching the selected topics.',
'UPDATE' => 'Update',
- 'USERS' => 'Users',
'USER_OFFLINE' => 'Offline',
'Unsub_success' => 'You have been un-subscribed from this group.',
'User_is_member_group' => 'User is already a member of this group',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 5f1bcabdbc..1365e90075 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -123,11 +123,12 @@ $lang += array(
'POST_UNLOCKED_SUCCESS' => 'Post unlocked successsfully',
'POST_UNRATED_SUCCESS' => 'Post unrated successfully',
- 'READ_PROFILE' => 'Profile',
'READ_USERNOTES' => 'User notes',
'READ_WARNINGS' => 'User warnings',
'REPORTS_TOTAL' => 'In total there are <b>%d</b> reports to review',
'REPORTS_ZERO_TOTAL' => 'There are no reports to review',
+ 'REPORT_MESSAGE' => 'Report this message',
+ 'REPORT_MESSAGE_EXPLAIN'=> 'Use this form to report the selected message to the private message moderators and board administrators. Reporting should generally be used only if the message breaks forum rules.',
'REPORT_NOTIFY' => 'Notify me',
'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with',
'REPORT_POST' => 'Report this post',
@@ -189,7 +190,7 @@ $lang += array(
),
'DESCRIPTION' => array(
'WAREZ' => 'The post contains links to illegal or pirated software',
- 'SPAM' => 'The reported post has for only purpose to advertise for a website or another product',
+ 'SPAM' => 'The reported post has the only purpose to advertise for a website or another product',
'OFF_TOPIC' => 'The reported post is off topic',
'OTHER' => 'The reported post does not fit into any other category, please use the description field'
)
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index c531c5e539..7b58ed63b9 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -111,6 +111,8 @@ $lang += array(
'VIEWING_PROFILE' => 'Profile view',
'VISITED' => 'Last visited',
+ 'WWW' => 'Website',
+
'YIM' => 'YIM'
);
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index d0f55185e8..2b23df3982 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -85,7 +85,7 @@ $lang += array(
'DRAFT_SAVED' => 'Draft successfully saved.',
'DRAFT_TITLE' => 'Draft Title',
- 'EDIT_POST' => 'Edit',
+ 'EDIT_POST' => 'Edit Post',
'EDIT_REASON' => 'Reason for editing this post',
'EMOTICONS' => 'Emoticons',
'EMPTY_MESSAGE' => 'You must enter a message when posting.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 5f33ca3efe..b305876e34 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -71,8 +71,6 @@ $lang += array(
'CONFIRM_CODE' => 'Confirmation code',
'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as you see it in the image, it is case sensitive, zero has a diagonal line through it.',
'CONFIRM_CODE_WRONG' => 'The confirmation code you entered was incorrect.',
- 'CONFIRM_DELETE_ATTACHMENT' => 'Are you sure you want to delete this attachment?',
- 'CONFIRM_DELETE_ATTACHMENTS'=> 'Are you sure you want to delete these attachments?',
'CONFIRM_EMAIL' => 'Confirm email address',
'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing your email address.',
'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board administrator requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
@@ -94,8 +92,15 @@ $lang += array(
'DEFAULT_SMILE' => 'Enable smilies by default',
'DEFINED_RULES' => 'Defined Rules',
'DELETE_ALL' => 'Delete all',
+ 'DELETE_ATTACHMENT' => 'Delete Attachment',
+ 'DELETE_ATTACHMENTS' => 'Delete Attachments',
+ 'DELETE_ATTACHMENT_CONFIRM' => 'Are you sure you want to delete this attachment?',
+ 'DELETE_ATTACHMENTS_CONFIRM'=> 'Are you sure you want to delete these attachments?',
'DELETE_AVATAR' => 'Delete Image',
'DELETE_MARKED' => 'Delete Marked',
+ 'DELETE_MARKED_PM' => 'Delete Marked Messages',
+ 'DELETE_MARKED_PM_CONFIRM' => 'Are you sure you want to delete all marked messages?',
+ 'DELETE_PM' => 'Delete PM',
'DELETE_RULE' => 'Delete Rule',
'DELETE_RULE_CONFIRM' => 'Are you sure you want to delete this rule?',
'DISABLE_CENSORS' => 'Enable Word censoring',
@@ -114,16 +119,21 @@ $lang += array(
'EXPORT_AS_TXT' => 'Export as TXT',
'EXPORT_AS_MSG' => 'Export as MSG',
+ 'FOE_MESSAGE' => 'Message from foe',
'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible and personal messages will not be permitted. Please note that you cannot ignore moderators or administrators.',
'FOES_UPDATED' => 'Your foes list has been updated successfully',
+ 'FOLDER_ADDED' => 'Folder successfully added',
'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored',
+ 'FOLDER_NAME_EXIST' => 'Folder <b>%s</b> already exist',
'FOLDER_STATUS_MSG' => 'Folder is %1$d%% full (%2$d from %3$d messages stored)',
'FORWARD_PM' => 'Forward PM',
+ 'FRIEND_MESSAGE' => 'Message from friend',
'FRIENDS' => 'Friends',
'FRIENDS_EXPLAIN' => 'Friends enable you quick access to members you communicate with frequently. If the template has relevant support any posts made by a friend may be highlighted.',
'FRIENDS_OFFLINE' => 'Offline',
'FRIENDS_ONLINE' => 'Online',
'FRIENDS_UPDATED' => 'Your friends list has been updated successfully',
+ 'FULL_FOLDER_OPTION_CHANGED'=> 'Full Folder Option changed successfully',
'HIDE_ONLINE' => 'Hide my online status',
@@ -139,10 +149,10 @@ $lang += array(
'MARK_IMPORTANT' => 'Mark as Important',
'MARKED_MESSAGE' => 'Marked Message',
+ 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached',
'MESSAGE_COLOURS' => 'Message Colours',
- 'MESSAGE_FROM_FOE' => 'Message from foe',
- 'MESSAGE_FROM_FRIEND' => 'Message from friend',
'MESSAGE_HISTORY' => 'Message History',
+ 'MESSAGE_REPORTED_MESSAGE' => 'Reported Message',
'MINIMUM_KARMA' => 'Minimum User Karma',
'MINIMUM_KARMA_EXPLAIN' => 'Posts by users with Karma less than this will be ignored.',
@@ -175,10 +185,12 @@ $lang += array(
'PASSWORD_ACTIVATED' => 'Your new password has been activated',
'PASSWORD_UPDATED' => 'Your password has been sent successfully to your original email address.',
'PM_DISABLED' => 'Private messaging has been disabled on this board',
+ 'PM_FROM' => 'From',
'PM_ICON' => 'PM Icon',
'PM_INBOX' => 'Inbox',
'PM_OUTBOX' => 'Outbox',
'PM_SENTBOX' => 'Sentbox',
+ 'PM_SUBJECT' => 'Message Subject',
'PM_TO' => 'Send To',
'POPUP_ON_PM' => 'Pop up window on new private message',
'POST_EDIT_PM' => 'Edit message',
@@ -199,10 +211,12 @@ $lang += array(
'REMOVE_ADDRESS' => 'Remove address',
'REMOVE_FOLDER' => 'Remove folder',
'REPLIED_MESSAGE' => 'Replied to Message',
- 'REPORTED_MESSAGE' => 'Reported Message',
- 'RETURN_PAGE' => 'Click %sHere%s to return to the previous page',
+ 'REPORT_PM' => 'Report PM',
'RETURN_UCP' => 'Click %sHere%s to return to the User Control Panel',
+ 'RULE_ADDED' => 'Rule successfully added',
+ 'RULE_ALREADY_DEFINED' => 'This rule was defined previously',
'RULE_DELETED' => 'Rule successfully removed',
+ 'RULE_NOT_DEFINED' => 'Rule not correctly specified',
'SEARCH_YOUR_POSTS' => 'Show your posts',
'SEND_PASSWORD' => 'Send password',
@@ -228,6 +242,7 @@ $lang += array(
'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will an email at the address you specified.',
'UCP_AGREEMENT' => 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.',
'UCP_AIM' => 'AOL Instant Messenger',
+ 'UCP_ATTACHMENTS' => 'Attachments',
'UCP_COPPA_BEFORE' => 'Before %s',
'UCP_COPPA_ON_AFTER' => 'On or After %s',
'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will recieve an email at the address you provide that contains an account activation link.',
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index aee06fd249..ae67f79962 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -31,6 +31,9 @@ $lang += array(
'ACTIVE_TOPICS' => 'Active Topics',
'ANNOUNCEMENTS' => 'Announcements',
+ 'ICON_ANNOUNCEMENT' => 'Announcement',
+ 'ICON_STICKY' => 'Sticky',
+
'LOGIN_NOTIFY_FORUM' => 'You have been notified about this forum, please login to view it.',
'MARK_TOPICS_READ' => 'Mark Topics Read',