mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-12 07:24:31 +02:00
Code Issues Releases Wiki Activity

Merge most changes from 3.0.x branch since the 25th december.

Browse Source 
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-03-22 16:34:26 +00:00
parent fac9c024ff
commit 4cbf6bc703
80 changed files with 2491 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/modules/mcp/mcp_main.php
View File

@@ -909,6 +909,11 @@ function mcp_delete_post($post_ids)
}
else
{
if ($affected_topics != 1 || $deleted_topics || !$topic_id)
{
$redirect = append_sid('mcp', "f=$forum_id&i=main&mode=forum_view", false);
}
meta_refresh(3, $redirect);
trigger_error($success_msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . '<br /><br />' . implode('<br /><br />', $return_link));
}
@@ -1160,8 +1165,8 @@ function mcp_fork_topic($topic_ids)
}
sync('forum', 'forum_id', $to_forum_id);
set_config('num_topics', phpbb::$config['num_topics'] + sizeof($new_topic_id_list), true);
set_config('num_posts', phpbb::$config['num_posts'] + $total_posts, true);
set_config_count('num_topics', sizeof($new_topic_id_list), true);
set_config_count('num_posts', $total_posts, true);
foreach ($new_topic_id_list as $topic_id => $new_topic_id)
{