aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-29 00:49:12 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-29 00:49:12 +0200
commit70f313eb4ff9481b6a3a4a81f1392e37608d4435 (patch)
treee048fbf0b1779ce35934cda6dec6c365c6494aff
parent1ba516a052b30c0875d72c8aea468cc5153c3fa6 (diff)
downloadforums-70f313eb4ff9481b6a3a4a81f1392e37608d4435.tar
forums-70f313eb4ff9481b6a3a4a81f1392e37608d4435.tar.gz
forums-70f313eb4ff9481b6a3a4a81f1392e37608d4435.tar.bz2
forums-70f313eb4ff9481b6a3a4a81f1392e37608d4435.tar.xz
forums-70f313eb4ff9481b6a3a4a81f1392e37608d4435.zip
[ticket/11942] Don't change the reason to '' when hard deleting
PHPBB3-11942
-rw-r--r--phpBB/includes/mcp/mcp_main.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index c133c4f574..ed604b9e3d 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -120,7 +120,7 @@ class mcp_main
trigger_error('NO_TOPIC_SELECTED');
}
- mcp_delete_topic($topic_ids, $soft_delete, ($soft_delete) ? $request->variable('delete_reason', '', true) : '');
+ mcp_delete_topic($topic_ids, $soft_delete, $request->variable('delete_reason', '', true));
break;
case 'delete_post':
@@ -137,7 +137,7 @@ class mcp_main
trigger_error('NO_POST_SELECTED');
}
- mcp_delete_post($post_ids, $soft_delete, ($soft_delete) ? $request->variable('delete_reason', '', true) : '');
+ mcp_delete_post($post_ids, $soft_delete, $request->variable('delete_reason', '', true));
break;
case 'restore_topic':