diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 2 |
6 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a9e0a630dc..ccf5aa4293 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -105,6 +105,9 @@ <li>[Change] Set template recompilation to be disabled by default. All mod and style authors and all those who want to modify their styles should enabled it after installation.</li> <li>[Change] Disable debug mode. All mod and style authors should enable DEBUG and DEBUG_EXTRA.</li> <li>[Fix] Check error reporting level for all error level. This fixes a problem for hosts having manipulated the error handler. (Bug #14831)</li> + <li>[Fix] Recache Moderators when copying permissions. (Bug #15384)</li> + <li>[Fix] Propagate sort options in mcp_forums (Bug #15464)</li> + </ul> <a name="v30rc6"></a><h3>1.ii. Changes since 3.0.RC6</h3> diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 27e54a38a0..bb8f437b80 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -239,6 +239,7 @@ class acp_forums // Now insert the data $db->sql_multi_insert(ACL_USERS_TABLE, $users_sql_ary); $db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary); + cache_moderators(); } $auth->acl_clear_prefetch(); diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 74369d2d92..d41e1f4a62 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -287,6 +287,7 @@ class acp_main // Clear permissions $auth->acl_clear_prefetch(); + cache_moderators(); add_log('admin', 'LOG_PURGE_CACHE'); break; diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e7d6fd2bc2..9ed2d78cb7 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -34,7 +34,7 @@ function generate_smilies($mode, $forum_id) $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - + $user->setup('posting', (int) $row['forum_style']); } else @@ -1629,7 +1629,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u if ($data['post_edit_reason'] || (!$auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post'))) { $data['post_edit_reason'] = truncate_string($data['post_edit_reason'], 255, false); - + $sql_data[POSTS_TABLE]['sql'] = array( 'post_edit_time' => $current_time, 'post_edit_reason' => $data['post_edit_reason'], diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 5f736e62b4..d97fbb7107 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -126,7 +126,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'S_MCP_ACTION' => $url . "&i=$id&forum_action=$action&mode=$mode&start=$start" . (($merge_select) ? $selected_ids : ''), - 'PAGINATION' => generate_pagination($url . "&i=$id&action=$action&mode=$mode" . (($merge_select) ? $selected_ids : ''), $forum_topics, $topics_per_page, $start), + 'PAGINATION' => generate_pagination($url . "&i=$id&action=$action&mode=$mode&sd=$sort_dir&sk=$sort_key&st=$sort_days" . (($merge_select) ? $selected_ids : ''), $forum_topics, $topics_per_page, $start), 'PAGE_NUMBER' => on_page($forum_topics, $topics_per_page, $start), 'TOTAL_TOPICS' => ($forum_topics == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $forum_topics), )); diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 35a3d1b2b6..e0bf9b10b6 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -115,7 +115,7 @@ $lang = array_merge($lang, array( 'FIRST' => 'First', 'ICONS_ADD' => 'Add a new icon', - 'ICON_NONE_ADDED' => 'No icons were added.', + 'ICONS_NONE_ADDED' => 'No icons were added.', 'ICONS_ONE_ADDED' => 'The icon has been added successfully.', 'ICONS_ADDED' => 'The icons have been added successfully.', 'ICONS_CONFIG' => 'Icon configuration', |