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

[ticket/12270] Better structured code and no debug error message

Browse source 
A variable (that's not essential) has been removed, two if's
has been merged to an if-else control structure. A variable
named topic_ids_list has been renamed to topic_id_list to follow
the naming standard in that file's code.
Also, the debug error has been fixed by changing the topic data
key 'username' to 'post_username' in the array_merge function
in approve_topics().

PHPBB3-12270
This commit is contained in:
marcosbc 2014-04-05 14:51:50 +02:00
parent 158705cf41
commit f9edc85f82
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -578,7 +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();
$topics_id_list = array(); $topic_id_list = array();
$s_hidden_fields = build_hidden_fields(array( $s_hidden_fields = build_hidden_fields(array(
'i' => $id, 'i' => $id,
@ -653,14 +653,12 @@ class mcp_queue
// Handle notifications // Handle notifications
foreach ($post_info as $post_id => $post_data) foreach ($post_info as $post_id => $post_data)
{ {
$send_topic_notification = false;
// A single topic approval may also happen here. // A single topic approval may also happen here.
if (!$post_data['topic_posts_approved']) if (!$post_data['topic_posts_approved'])
{ {
$send_topic_notification = true; $topic_id_list[] = $post_data['topic_id'];
$topics_id_list[] = $post_data['topic_id'];
} }
<<<<<<< HEAD
$phpbb_notifications->delete_notifications('post_in_queue', $post_id); $phpbb_notifications->delete_notifications('post_in_queue', $post_id);
<<<<<<< HEAD <<<<<<< HEAD
@ -673,6 +671,10 @@ class mcp_queue
// Send post notification only if a topic notification will not be sent. // Send post notification only if a topic notification will not be sent.
if (!$send_topic_notification) if (!$send_topic_notification)
>>>>>>> c3f1f31... [ticket/12270] Correct notifications for posts/topics now working >>>>>>> c3f1f31... [ticket/12270] Correct notifications for posts/topics now working
=======
// Send post notification only if a topic notification will not be sent.
else
>>>>>>> a21cc11... [ticket/12270] Better structured code and no debug error message
{ {
$phpbb_notifications->add_notifications(array( $phpbb_notifications->add_notifications(array(
'quote', 'quote',
@ -680,6 +682,7 @@ class mcp_queue
'post', 'post',
), $post_data); ), $post_data);
} }
$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
$phpbb_notifications->mark_notifications_read(array( $phpbb_notifications->mark_notifications_read(array(
'quote', 'quote',
@ -699,7 +702,8 @@ class mcp_queue
} }
} }
self::approve_topics($action, $topics_id_list, $id, $mode); if(count($topic_id_list) > 0)
self::approve_topics($action, $topic_id_list, $id, $mode);
} }
meta_refresh(3, $redirect); meta_refresh(3, $redirect);
@ -845,7 +849,7 @@ class mcp_queue
'post_subject' => $topic_data['topic_title'], 'post_subject' => $topic_data['topic_title'],
'post_time' => $topic_data['topic_time'], 'post_time' => $topic_data['topic_time'],
'poster_id' => $topic_data['topic_poster'], 'poster_id' => $topic_data['topic_poster'],
'username' => $topic_data['topic_first_poster_name'], 'post_username' => $topic_data['topic_first_poster_name'],
)); ));
$phpbb_notifications->delete_notifications('topic_in_queue', $topic_id); $phpbb_notifications->delete_notifications('topic_in_queue', $topic_id);