mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Fixed problem with msg v.s. msgs when deleting (#503157)
git-svn-id: file:///svn/phpbb/trunk@1872 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
55f4b05b77
commit
68b57431ba
1 changed files with 6 additions and 1 deletions
|
@ -580,6 +580,11 @@ else if( ( $delete && $mark_list ) || $delete_all )
|
||||||
{
|
{
|
||||||
header("Location: " . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
|
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 )
|
if( !$confirm )
|
||||||
{
|
{
|
||||||
|
@ -601,7 +606,7 @@ else if( ( $delete && $mark_list ) || $delete_all )
|
||||||
);
|
);
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
"MESSAGE_TITLE" => $lang['Information'],
|
"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_YES" => $lang['Yes'],
|
||||||
"L_NO" => $lang['No'],
|
"L_NO" => $lang['No'],
|
||||||
|
|
Loading…
Add table
Reference in a new issue