mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-23 18:38:53 +00:00
Minor fixes
#12699 git-svn-id: file:///svn/phpbb/trunk@7800 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
71b99a3f04
commit
78c1256e5c
3 changed files with 7 additions and 1 deletions
|
@ -189,6 +189,7 @@ p a {
|
|||
<li>[Fix] Force prune related values to integers during conversions</li>
|
||||
<li>[Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications [Bug #12685]</li>
|
||||
<li>[Fix] Updater is no longer listing missing language entries and styles if these had been removed [Bug #12655]</li>
|
||||
<li>[Fix] Correct approval of posts in global announcements (Bug #12699)</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -115,11 +115,16 @@ function update_post_information($type, $ids, $return_update_sql = false)
|
|||
{
|
||||
global $db;
|
||||
|
||||
if (empty($ids))
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!is_array($ids))
|
||||
{
|
||||
$ids = array($ids);
|
||||
}
|
||||
|
||||
|
||||
$update_sql = $empty_forums = $not_empty_forums = array();
|
||||
|
||||
if ($type != 'topic')
|
||||
|
|
|
@ -210,7 +210,7 @@ $lang = array_merge($lang, array(
|
|||
'GLOBAL_ANNOUNCEMENT' => 'Global announcement',
|
||||
|
||||
'HIDE_ONLINE' => 'Hide my online status',
|
||||
'HIDE_ONLINE_EXPLAIN' => 'Changing this setting to "No" won\'t become effective until your next visit to the board.',
|
||||
'HIDE_ONLINE_EXPLAIN' => 'Changing this setting won\'t become effective until your next visit to the board.',
|
||||
'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)',
|
||||
'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back',
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue