mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6225 from rubencm/ticket/16790

Browse Source 
[ticket/16790] Remove unused code
This commit is contained in:
Marc Alexander
2022-12-09 21:17:23 +01:00
committed by GitHub
parent f48ff960f1 0650d6f302
commit 8841d88845
34 changed files with 93 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_login_link.php
View File

@@ -199,7 +199,7 @@ class ucp_login_link
*/
protected function process_login_result($result)
{
global $config, $template, $user, $phpbb_container;
global $config, $template, $user, $phpbb_container, $phpbb_root_path, $phpEx;
$login_error = null;

8
phpBB/includes/ucp/ucp_main.php
View File

@@ -666,6 +666,7 @@ class ucp_main
WHERE ' . $db->sql_in_set('topic_id', array_unique($topic_ids));
$result = $db->sql_query($sql);
$topic_rows = [];
while ($row = $db->sql_fetchrow($result))
{
$topic_rows[$row['topic_id']] = $row;
@@ -890,7 +891,7 @@ class ucp_main
$sql = $db->sql_build_query('SELECT', $sql_array);
$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
$topic_list = $topic_forum_list = $global_announce_list = $rowset = array();
$topic_list = $topic_forum_list = $rowset = array();
while ($row = $db->sql_fetchrow($result))
{
$topic_id = (isset($row['b_topic_id'])) ? $row['b_topic_id'] : $row['topic_id'];
@@ -900,11 +901,6 @@ class ucp_main
$topic_forum_list[$row['forum_id']]['forum_mark_time'] = ($config['load_db_lastread']) ? $row['forum_mark_time'] : 0;
$topic_forum_list[$row['forum_id']]['topics'][] = $topic_id;
if ($row['topic_type'] == POST_GLOBAL)
{
$global_announce_list[] = $topic_id;
}
}
$db->sql_freeresult($result);

2
phpBB/includes/ucp/ucp_pm.php
View File

@@ -45,7 +45,7 @@ class ucp_pm
function main($id, $mode)
{
global $user, $template, $phpbb_root_path, $auth, $phpEx, $db, $config, $request;
global $user, $template, $phpbb_root_path, $auth, $phpEx, $db, $config, $request, $global_privmsgs_rules, $global_rule_conditions;
if (!$user->data['is_registered'])
{

2
phpBB/includes/ucp/ucp_pm_compose.php
View File

@@ -1028,7 +1028,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
parse_attachments(false, $preview_message, $attachment_data, $update_count, true);
foreach ($attachment_data as $i => $attachment)
foreach ($attachment_data as $attachment)
{
$template->assign_block_vars('attachment', array(
'DISPLAY_ATTACHMENT' => $attachment)

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

@@ -37,7 +37,7 @@ class ucp_profile
$user->add_lang('posting');
$submit = $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
$error = $data = array();
$error = array();
$s_hidden_fields = '';
switch ($mode)

2
phpBB/includes/ucp/ucp_register.php
View File

@@ -106,7 +106,7 @@ class ucp_register
/* @var $cp \phpbb\profilefields\manager */
$cp = $phpbb_container->get('profilefields.manager');
$error = $cp_data = $cp_error = array();
$error = $cp_data = array();
$s_hidden_fields = array();
// Handle login_link data added to $_hidden_fields