makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages 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
Show stats 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, '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); 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 // 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 = ''; $rank_title = $rank_img = '';
$avatar_img = phpbb_get_user_avatar($userrow); $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 // 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); 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); $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) : ''; $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']); 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; break;
case 'avatar': case 'avatar':
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
add_form_key('ucp_avatar'); add_form_key('ucp_avatar');

5
phpBB/memberlist.php
View file

@ -548,11 +548,6 @@ switch ($mode)
$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], $parse_flags, true); $member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], $parse_flags, true);
} }
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
$poster_avatar = phpbb_get_user_avatar($member); $poster_avatar = phpbb_get_user_avatar($member);
// We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links // We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links

4
phpBB/viewtopic.php
View file

@ -16,10 +16,6 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'common.' . $phpEx);
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
include($phpbb_root_path . 'includes/bbcode.' . $phpEx); include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
if (!function_exists('phpbb_get_user_avatar'))
{
include($phpbb_root_path . 'includes/functions.' . $phpEx);
}
// Start session management // Start session management
$user->session_begin(); $user->session_begin();