mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x' into ticket/15948

Browse Source
This commit is contained in:
3Di
2019-03-23 05:09:17 +01:00
committed by GitHub
parent 6c1664f6d3 0d04f53f37
commit 6921565efe
71 changed files with 554 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/mcp/mcp_ban.php
View File

@@ -34,7 +34,10 @@ class mcp_ban
}
// Include the admin banning interface...
include($phpbb_root_path . 'includes/acp/acp_ban.' . $phpEx);
if (!class_exists('acp_ban'))
{
include($phpbb_root_path . 'includes/acp/acp_ban.' . $phpEx);
}
$bansubmit = $request->is_set_post('bansubmit');
$unbansubmit = $request->is_set_post('unbansubmit');

5
phpBB/includes/mcp/mcp_front.php
View File

@@ -290,7 +290,10 @@ function mcp_front_view($id, $mode, $action)
if ($total)
{
include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
if (!function_exists('get_recipient_strings'))
{
include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
}
$sql_ary = array(
'SELECT' => 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, p.message_attachment, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id',

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

@@ -28,9 +28,9 @@ class mcp_logs
var $u_action;
var $p_master;
function __construct(&$p_master)
function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
function main($id, $mode)

34
phpBB/includes/mcp/mcp_main.php
View File

@@ -28,9 +28,9 @@ class mcp_main
var $p_master;
var $u_action;
function __construct(&$p_master)
function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
function main($id, $mode)
@@ -174,7 +174,10 @@ class mcp_main
switch ($mode)
{
case 'front':
include($phpbb_root_path . 'includes/mcp/mcp_front.' . $phpEx);
if (!function_exists('mcp_front_view'))
{
include($phpbb_root_path . 'includes/mcp/mcp_front.' . $phpEx);
}
$user->add_lang('acp/common');
@@ -185,7 +188,10 @@ class mcp_main
break;
case 'forum_view':
include($phpbb_root_path . 'includes/mcp/mcp_forum.' . $phpEx);
if (!function_exists('mcp_forum_view'))
{
include($phpbb_root_path . 'includes/mcp/mcp_forum.' . $phpEx);
}
$user->add_lang('viewforum');
@@ -208,7 +214,10 @@ class mcp_main
break;
case 'topic_view':
include($phpbb_root_path . 'includes/mcp/mcp_topic.' . $phpEx);
if (!function_exists('mcp_topic_view'))
{
include($phpbb_root_path . 'includes/mcp/mcp_topic.' . $phpEx);
}
mcp_topic_view($id, $mode, $action);
@@ -217,7 +226,10 @@ class mcp_main
break;
case 'post_details':
include($phpbb_root_path . 'includes/mcp/mcp_post.' . $phpEx);
if (!function_exists('mcp_post_details'))
{
include($phpbb_root_path . 'includes/mcp/mcp_post.' . $phpEx);
}
mcp_post_details($id, $mode, $action);
@@ -414,6 +426,7 @@ function change_topic_type($action, $topic_ids)
if (confirm_box(true))
{
/**
* Perform additional actions before changing topic(s) type
*
@@ -430,6 +443,8 @@ function change_topic_type($action, $topic_ids)
);
extract($phpbb_dispatcher->trigger_event('core.mcp_change_topic_type_before', compact($vars)));
$db->sql_transaction('begin');
$sql = 'UPDATE ' . TOPICS_TABLE . "
SET topic_type = $new_topic_type
WHERE " . $db->sql_in_set('topic_id', $topic_ids);
@@ -441,13 +456,10 @@ function change_topic_type($action, $topic_ids)
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_moved_id', $topic_ids);
$db->sql_query($sql);
$sql = 'UPDATE ' . TOPICS_TABLE . "
SET topic_type = $new_topic_type
WHERE " . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
$db->sql_transaction('commit');
$success_msg = (count($topic_ids) == 1) ? 'TOPIC_TYPE_CHANGED' : 'TOPICS_TYPE_CHANGED';
if (count($topic_ids))

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

@@ -28,9 +28,9 @@ class mcp_notes
var $p_master;
var $u_action;
function __construct(&$p_master)
function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
function main($id, $mode)

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

@@ -28,9 +28,9 @@ class mcp_pm_reports
var $p_master;
var $u_action;
function __construct(&$p_master)
function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
function main($id, $mode)

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

@@ -28,9 +28,9 @@ class mcp_queue
var $p_master;
var $u_action;
public function __construct(&$p_master)
public function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
public function main($id, $mode)

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

@@ -28,9 +28,9 @@ class mcp_reports
var $p_master;
var $u_action;
function __construct(&$p_master)
function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
function main($id, $mode)

6
phpBB/includes/mcp/mcp_topic.php
View File

@@ -93,7 +93,11 @@ function mcp_topic_view($id, $mode, $action)
// Restore or pprove posts?
if (($action == 'restore' || $action == 'approve') && $auth->acl_get('m_approve', $topic_info['forum_id']))
{
include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
if (!class_exists('mcp_queue'))
{
include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
}
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);

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

@@ -28,9 +28,9 @@ class mcp_warn
var $p_master;
var $u_action;
function __construct(&$p_master)
function __construct($p_master)
{
$this->p_master = &$p_master;
$this->p_master = $p_master;
}
function main($id, $mode)