makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fixes

Browse source 
#12699


git-svn-id: file:///svn/phpbb/trunk@7800 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-06-26 14:27:22 +00:00
parent 71b99a3f04
commit 78c1256e5c
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -189,6 +189,7 @@ p a {
<li>[Fix] Force prune related values to integers during conversions</li> <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 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] 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> </ul>
</div> </div>

5
phpBB/includes/functions_posting.php
View file

@ -115,11 +115,16 @@ function update_post_information($type, $ids, $return_update_sql = false)
{ {
global $db; global $db;
if (empty($ids))
{
return;
}
if (!is_array($ids)) if (!is_array($ids))
{ {
$ids = array($ids); $ids = array($ids);
} }
$update_sql = $empty_forums = $not_empty_forums = array(); $update_sql = $empty_forums = $not_empty_forums = array();
if ($type != 'topic') if ($type != 'topic')

2
phpBB/language/en/ucp.php
View file

@ -210,7 +210,7 @@ $lang = array_merge($lang, array(
'GLOBAL_ANNOUNCEMENT' => 'Global announcement', 'GLOBAL_ANNOUNCEMENT' => 'Global announcement',
'HIDE_ONLINE' => 'Hide my online status', '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' => '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', 'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back',