mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Changed: if the user hits "merge" and no destination topic is selected, the topic selection screen magically appears
git-svn-id: file:///svn/phpbb/trunk@3941 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
23a9077a0b
commit
0ed1f9d2b2
1 changed files with 4 additions and 0 deletions
|
@ -1544,6 +1544,10 @@ switch ($mode)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'merge_posts':
|
case 'merge_posts':
|
||||||
|
if (!$to_topic_id)
|
||||||
|
{
|
||||||
|
redirect("mcp.$phpEx$SID&mode=select_topic&f=$forum_id" . str_replace('&', '&', $url_extra));
|
||||||
|
}
|
||||||
if (!count($post_id_list))
|
if (!count($post_id_list))
|
||||||
{
|
{
|
||||||
trigger_error($user->lang['NO_POST_SELECTED'] . '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&mode=merge&t=' . $topic_id . '&to_topic_id=' . $to_topic_id . '">', '</a>'));
|
trigger_error($user->lang['NO_POST_SELECTED'] . '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&mode=merge&t=' . $topic_id . '&to_topic_id=' . $to_topic_id . '">', '</a>'));
|
||||||
|
|
Loading…
Add table
Reference in a new issue