makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#12067

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7739 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-06-09 12:26:32 +00:00
parent 9f4fceb9b6
commit 1667a17923
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -255,6 +255,7 @@ p a {
<li>[Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy</li> <li>[Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy</li>
<li>[Fix] Remember selected language while registering after submit (Bug #11435)</li> <li>[Fix] Remember selected language while registering after submit (Bug #11435)</li>
<li>[Fix] UTF-8 support in theme and template editors (Bug #12251)</li> <li>[Fix] UTF-8 support in theme and template editors (Bug #12251)</li>
<li>[Fix] Allow for posts per page in the MCP to change during topic selection (Bug #12067)</li>
</ul> </ul>

16
phpBB/includes/mcp/mcp_topic.php
View file

@ -37,18 +37,25 @@ function mcp_topic_view($id, $mode, $action)
$to_topic_id = request_var('to_topic_id', 0); $to_topic_id = request_var('to_topic_id', 0);
$to_forum_id = request_var('to_forum_id', 0); $to_forum_id = request_var('to_forum_id', 0);
$post_id_list = request_var('post_id_list', array(0)); $post_id_list = request_var('post_id_list', array(0));
$sort = isset($_POST['sort']) ? true : false;
// Split Topic? // Split Topic?
if ($action == 'split_all' || $action == 'split_beyond') if ($action == 'split_all' || $action == 'split_beyond')
{ {
split_topic($action, $topic_id, $to_forum_id, $subject); if (!$sort)
{
split_topic($action, $topic_id, $to_forum_id, $subject);
}
$action = 'split'; $action = 'split';
} }
// Merge Posts? // Merge Posts?
if ($action == 'merge_posts') if ($action == 'merge_posts')
{ {
merge_posts($topic_id, $to_topic_id); if (!$sort)
{
merge_posts($topic_id, $to_topic_id);
}
$action = 'merge'; $action = 'merge';
} }
@ -69,7 +76,10 @@ function mcp_topic_view($id, $mode, $action)
trigger_error('NO_POST_SELECTED'); trigger_error('NO_POST_SELECTED');
} }
approve_post($post_id_list, $id, $mode); if (!$sort)
{
approve_post($post_id_list, $id, $mode);
}
} }
// Jumpbox, sort selects and that kind of things // Jumpbox, sort selects and that kind of things