From 78c1256e5cc3b5372c7b07cc4a13215c4f779c25 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 26 Jun 2007 14:27:22 +0000 Subject: [PATCH] Minor fixes #12699 git-svn-id: file:///svn/phpbb/trunk@7800 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_posting.php | 5 +++++ phpBB/language/en/ucp.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e2bb0a6ba1..9ec9144bb4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -189,6 +189,7 @@ p a {
  • [Fix] Force prune related values to integers during conversions
  • [Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications [Bug #12685]
  • [Fix] Updater is no longer listing missing language entries and styles if these had been removed [Bug #12655]
    • +
  • [Fix] Correct approval of posts in global announcements (Bug #12699)
    • diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 282e74fa7c..cf38f07a15 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -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') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 304b9952d1..de000cd0b3 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -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',