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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits
This commit is contained in:
Andreas Fischer 2014-06-09 02:38:35 +02:00
commit 31abf1ab02
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_content.php
View file

@ -1401,7 +1401,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
// no break; // no break;
} }
if (!isset($username_string)) if (!isset($username_string))
{ {
if (($mode == 'full' && !$profile_url) || $mode == 'no_profile') if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')

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

@ -655,7 +655,7 @@ class mcp_queue
if (!$post_data['topic_posts_approved']) if (!$post_data['topic_posts_approved'])
{ {
$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']); $phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
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);