aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/privmsg.php
diff options
context:
space:
mode:
authorBart van Bragt <bartvb@users.sourceforge.net>2002-01-14 20:16:09 +0000
committerBart van Bragt <bartvb@users.sourceforge.net>2002-01-14 20:16:09 +0000
commit68b57431ba95cb12186f975579af725ed09f2ae3 (patch)
treee7187ecaeb45ec623e17cace7bbfb8d30fa92f17 /phpBB/privmsg.php
parent55f4b05b7743776209f027e3ae3c2e1ae3fa95d2 (diff)
downloadforums-68b57431ba95cb12186f975579af725ed09f2ae3.tar
forums-68b57431ba95cb12186f975579af725ed09f2ae3.tar.gz
forums-68b57431ba95cb12186f975579af725ed09f2ae3.tar.bz2
forums-68b57431ba95cb12186f975579af725ed09f2ae3.tar.xz
forums-68b57431ba95cb12186f975579af725ed09f2ae3.zip
Fixed problem with msg v.s. msgs when deleting (#503157)
git-svn-id: file:///svn/phpbb/trunk@1872 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/privmsg.php')
-rw-r--r--phpBB/privmsg.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index a232c0b0d7..3b2557d80a 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -580,6 +580,11 @@ else if( ( $delete && $mark_list ) || $delete_all )
{
header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
}
+ if( isset($mark_list) && !is_array($mark_list) )
+ {
+ // Set to empty array instead of '0' if nothing is selected.
+ $mark_list = array();
+ }
if( !$confirm )
{
@@ -601,7 +606,7 @@ else if( ( $delete && $mark_list ) || $delete_all )
);
$template->assign_vars(array(
"MESSAGE_TITLE" => $lang['Information'],
- "MESSAGE_TEXT" => ( count($mark_list) == 1 ) ? $lang['Confirm_delete_pm'] : $lang['Confirm_delete_pms'],
+ "MESSAGE_TEXT" => ( count($mark_list) == 1) ? $lang['Confirm_delete_pm'] : $lang['Confirm_delete_pms'],
"L_YES" => $lang['Yes'],
"L_NO" => $lang['No'],