mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

[ticket/9758] Removed useless if-conditions to include functions.php

Browse Source 
PHPBB3-9758
This commit is contained in:
Crizzo
2014-03-15 15:18:04 +01:00
parent e149c266ce
commit 0d4968f735
7 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_compatibility.php
View File

@@ -39,13 +39,6 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
'avatar_height' => $avatar_height,
);
if (!function_exists('phpbb_get_avatar'))
{
global $phpbb_root_path, $phpEx;
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
return phpbb_get_avatar($row, $alt, $ignore_config);
}

4
phpBB/includes/mcp/mcp_notes.php
View File

@@ -174,10 +174,6 @@ class mcp_notes
}
// Generate the appropriate user information for the user we are looking at
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
$rank_title = $rank_img = '';
$avatar_img = phpbb_get_user_avatar($userrow);

4
phpBB/includes/mcp/mcp_warn.php
View File

@@ -398,10 +398,6 @@ class mcp_warn
}
// Generate the appropriate user information for the user we are looking at
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
$avatar_img = phpbb_get_user_avatar($user_row);

5
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -338,11 +338,6 @@ function get_user_information($user_id, $user_row)
}
}
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);

4
phpBB/includes/ucp/ucp_profile.php
View File

@@ -515,10 +515,6 @@ class ucp_profile
break;
case 'avatar':
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
add_form_key('ucp_avatar');