makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12270] Fixed tests not working

Browse source 
The success message wasn't output correctly if we were approving
topics.

PHPBB3-12270
This commit is contained in:
marcosbc 2014-05-21 00:25:22 +02:00
parent 984ae598be
commit c47c50a29e
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/includes/mcp/mcp_queue.php
View file

@ -578,6 +578,7 @@ class mcp_queue
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
$success_msg = $post_url = ''; $success_msg = $post_url = '';
$approve_log = array(); $approve_log = array();
$num_topics = 0;
$s_hidden_fields = build_hidden_fields(array( $s_hidden_fields = build_hidden_fields(array(
'i' => $id, 'i' => $id,
@ -634,11 +635,6 @@ class mcp_queue
$phpbb_content_visibility->set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post'])); $phpbb_content_visibility->set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
} }
if (sizeof($post_info) >= 1)
{
$success_msg = (sizeof($post_info) == 1) ? 'POST_' . strtoupper($action) . 'D_SUCCESS' : 'POSTS_' . strtoupper($action) . 'D_SUCCESS';
}
foreach ($approve_log as $log_data) foreach ($approve_log as $log_data)
{ {
add_log('mod', $log_data['forum_id'], $log_data['topic_id'], 'LOG_POST_' . strtoupper($action) . 'D', $log_data['post_subject']); add_log('mod', $log_data['forum_id'], $log_data['topic_id'], 'LOG_POST_' . strtoupper($action) . 'D', $log_data['post_subject']);
@ -660,6 +656,7 @@ class mcp_queue
if ($post_data['post_visibility'] == ITEM_UNAPPROVED) if ($post_data['post_visibility'] == ITEM_UNAPPROVED)
{ {
$phpbb_notifications->add_notifications(array('topic'), $post_data); $phpbb_notifications->add_notifications(array('topic'), $post_data);
$num_topics++;
} }
} }
else else
@ -705,6 +702,15 @@ class mcp_queue
} }
} }
if ($num_topics >= 1)
{
$success_msg = ($num_topics == 1) ? 'TOPIC_' . strtoupper($action) . 'D_SUCCESS' : 'TOPICS_' . strtoupper($action) . 'D_SUCCESS';
}
else
{
$success_msg = (sizeof($post_info) == 1) ? 'POST_' . strtoupper($action) . 'D_SUCCESS' : 'POSTS_' . strtoupper($action) . 'D_SUCCESS';
}
meta_refresh(3, $redirect); meta_refresh(3, $redirect);
$message = $user->lang[$success_msg]; $message = $user->lang[$success_msg];
@ -729,7 +735,6 @@ class mcp_queue
} }
else else
{ {
$num_topics = 0;
$show_notify = false; $show_notify = false;
if ($action == 'approve') if ($action == 'approve')