diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-28 12:15:14 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-28 12:15:14 +0000 |
| commit | 465c15f08459a8f7865bb368cb739fd390dbf6b8 (patch) | |
| tree | 353dcfb3921e1df14293203292edef952594fd80 | |
| parent | 1db9e62e084e29638e785c93f917e6e2acc13986 (diff) | |
| download | forums-465c15f08459a8f7865bb368cb739fd390dbf6b8.tar forums-465c15f08459a8f7865bb368cb739fd390dbf6b8.tar.gz forums-465c15f08459a8f7865bb368cb739fd390dbf6b8.tar.bz2 forums-465c15f08459a8f7865bb368cb739fd390dbf6b8.tar.xz forums-465c15f08459a8f7865bb368cb739fd390dbf6b8.zip | |
#11611
git-svn-id: file:///svn/phpbb/trunk@7969 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2e86f5142f..d999ec8e00 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -271,7 +271,7 @@ p a { <li>[Fix] Finer error conditions for sending IM messages (Bugs #13681, #13683)</li> <li>[Fix] Add a confirmation for log deletion in the MCP (Bug #13693)</li> <li>[Fix] Do not erase ranks and avatars when changing default groups (Bugs #13701, #13697)</li> - <li>[Fix] Limit author searches to firstpost, if selected (Bug #13579)</li> + <li>[Fix] Limit author searches to firstpost, if selected (Bug #13579)</li> <li>[Fix] Properly resync user post counts for users that have no posts (Bug #13581)</li> <li>[Fix] Do not require space after , in smiley pak files (Bug #13647)</li> <li>[Fix] Properly display the subscribe link in topic and forum display for Oracle (Bug #13583)</li> @@ -290,6 +290,7 @@ p a { <li>[Fix] Allow moving private messages from the sentbox (Bug #13791)</li> <li>[Fix] Properly export localized imagesets</li> <li>[Feature] Show the size of Firebird databases</li> + <li>[Fix] Show error when moving topic into a category via quickmod (Bug #11611)</li> </ul> diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 199a54032a..8f242f3165 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -570,10 +570,15 @@ function mcp_move_topic($topic_ids) } } } + else + { + $additional_msg = $user->lang['FORUM_NOT_EXIST']; + } if (!$to_forum_id || $additional_msg) { unset($_POST['confirm']); + unset($_REQUEST['confirm_key']); } if (confirm_box(true)) @@ -964,10 +969,15 @@ function mcp_fork_topic($topic_ids) } } } + else + { + $additional_msg = $user->lang['FORUM_NOT_EXIST']; + } - if (!$to_forum_id || $additional_msg) + if ($additional_msg) { unset($_POST['confirm']); + unset($_REQUEST['confirm_key']); } if (confirm_box(true)) |