diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-23 23:04:12 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-23 23:04:12 +0000 |
| commit | 0ed1f9d2b21447d8e9f558dd64466c1c7e86f9dd (patch) | |
| tree | 17a29b844b18f03203555cc6d06c4859e73e96f5 | |
| parent | 23a9077a0b4b3ce6ee8c759675fb55d6646ff364 (diff) | |
| download | forums-0ed1f9d2b21447d8e9f558dd64466c1c7e86f9dd.tar forums-0ed1f9d2b21447d8e9f558dd64466c1c7e86f9dd.tar.gz forums-0ed1f9d2b21447d8e9f558dd64466c1c7e86f9dd.tar.bz2 forums-0ed1f9d2b21447d8e9f558dd64466c1c7e86f9dd.tar.xz forums-0ed1f9d2b21447d8e9f558dd64466c1c7e86f9dd.zip | |
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
| -rw-r--r-- | phpBB/mcp.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index f32ffcd48e..066e04868a 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -1544,6 +1544,10 @@ switch ($mode) break; 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)) { 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>')); |