aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-09 02:38:34 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-09 02:38:34 +0200
commit373918583dd1d8c271d34eed013f81181ee90e0b (patch)
tree2cf0f986c51783b1cc1bacce17316d35b364281f
parent6c1ff04ca092cde6a4dadd0b137cd6e4613822aa (diff)
parente8174f3d661f4d49feb34facf6ab9a2584aee9c9 (diff)
downloadforums-373918583dd1d8c271d34eed013f81181ee90e0b.tar
forums-373918583dd1d8c271d34eed013f81181ee90e0b.tar.gz
forums-373918583dd1d8c271d34eed013f81181ee90e0b.tar.bz2
forums-373918583dd1d8c271d34eed013f81181ee90e0b.tar.xz
forums-373918583dd1d8c271d34eed013f81181ee90e0b.zip
Merge pull request #2561 from marc1706/ticket/12675
[ticket/12675] Fix code sniffer complaints introduced by recent commits * marc1706/ticket/12675: [ticket/12675] Fix code sniffer complaints introduced by recent commits
-rw-r--r--phpBB/includes/functions_content.php2
-rw-r--r--phpBB/includes/mcp/mcp_queue.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index f988d009ad..72fca905e0 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1401,7 +1401,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
// no break;
}
-
+
if (!isset($username_string))
{
if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 5dd39dbf0f..e2ca3a8752 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -655,7 +655,7 @@ class mcp_queue
if (!$post_data['topic_posts_approved'])
{
$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
-
+
if ($post_data['post_visibility'] == ITEM_UNAPPROVED)
{
$phpbb_notifications->add_notifications(array('topic'), $post_data);