makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-12-24 15:32:58 +01:00
commit c79da081d8
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
21 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_inactive.php
View file

@ -24,9 +24,9 @@ class acp_inactive
var $u_action; var $u_action;
var $p_master; 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) function main($id, $mode)

6
phpBB/includes/acp/acp_permissions.php
View file

@ -676,7 +676,7 @@ class acp_permissions
/** /**
* Apply permissions * Apply permissions
*/ */
function set_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id) function set_permissions($mode, $permission_type, $auth_admin, &$user_id, &$group_id)
{ {
global $db, $cache, $user, $auth; global $db, $cache, $user, $auth;
global $request; global $request;
@ -765,7 +765,7 @@ class acp_permissions
/** /**
* Apply all permissions * Apply all permissions
*/ */
function set_all_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id) function set_all_permissions($mode, $permission_type, $auth_admin, &$user_id, &$group_id)
{ {
global $db, $cache, $user, $auth; global $db, $cache, $user, $auth;
global $request; global $request;
@ -881,7 +881,7 @@ class acp_permissions
/** /**
* Remove permissions * Remove permissions
*/ */
function remove_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id, &$forum_id) function remove_permissions($mode, $permission_type, $auth_admin, &$user_id, &$group_id, &$forum_id)
{ {
global $user, $db, $cache, $auth; global $user, $db, $cache, $auth;

4
phpBB/includes/acp/acp_profile.php
View file

@ -845,7 +845,7 @@ class acp_profile
/** /**
* Build all Language specific options * Build all Language specific options
*/ */
function build_language_options(&$cp, $field_type, $action = 'create') function build_language_options($cp, $field_type, $action = 'create')
{ {
global $user, $config, $db, $request; global $user, $config, $db, $request;
@ -942,7 +942,7 @@ class acp_profile
/** /**
* Save Profile Field * Save Profile Field
*/ */
function save_profile_field(&$cp, $field_type, $action = 'create') function save_profile_field($cp, $field_type, $action = 'create')
{ {
global $db, $config, $user, $phpbb_container, $phpbb_log, $request, $phpbb_dispatcher; global $db, $config, $user, $phpbb_container, $phpbb_log, $request, $phpbb_dispatcher;

4
phpBB/includes/acp/acp_users.php
View file

@ -24,9 +24,9 @@ class acp_users
var $u_action; var $u_action;
var $p_master; 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) function main($id, $mode)

2
phpBB/includes/functions_compatibility.php
View file

@ -362,7 +362,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $
* *
* @deprecated 3.1.0 (To be removed: 4.0.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function get_tables(&$db) function get_tables($db)
{ {
$db_tools_factory = new \phpbb\db\tools\factory(); $db_tools_factory = new \phpbb\db\tools\factory();
$db_tools = $db_tools_factory->get($db); $db_tools = $db_tools_factory->get($db);

16
phpBB/includes/functions_mcp.php
View file

@ -22,12 +22,12 @@ if (!defined('IN_PHPBB'))
/** /**
* Functions used to generate additional URL paramters * Functions used to generate additional URL paramters
*/ */
function phpbb_module__url($mode, &$module_row) function phpbb_module__url($mode, $module_row)
{ {
return phpbb_extra_url(); return phpbb_extra_url();
} }
function phpbb_module_notes_url($mode, &$module_row) function phpbb_module_notes_url($mode, $module_row)
{ {
if ($mode == 'front') if ($mode == 'front')
{ {
@ -38,7 +38,7 @@ function phpbb_module_notes_url($mode, &$module_row)
return ($user_id) ? "&u=$user_id" : ''; return ($user_id) ? "&u=$user_id" : '';
} }
function phpbb_module_warn_url($mode, &$module_row) function phpbb_module_warn_url($mode, $module_row)
{ {
if ($mode == 'front' || $mode == 'list') if ($mode == 'front' || $mode == 'list')
{ {
@ -64,27 +64,27 @@ function phpbb_module_warn_url($mode, &$module_row)
} }
} }
function phpbb_module_main_url($mode, &$module_row) function phpbb_module_main_url($mode, $module_row)
{ {
return phpbb_extra_url(); return phpbb_extra_url();
} }
function phpbb_module_logs_url($mode, &$module_row) function phpbb_module_logs_url($mode, $module_row)
{ {
return phpbb_extra_url(); return phpbb_extra_url();
} }
function phpbb_module_ban_url($mode, &$module_row) function phpbb_module_ban_url($mode, $module_row)
{ {
return phpbb_extra_url(); return phpbb_extra_url();
} }
function phpbb_module_queue_url($mode, &$module_row) function phpbb_module_queue_url($mode, $module_row)
{ {
return phpbb_extra_url(); return phpbb_extra_url();
} }
function phpbb_module_reports_url($mode, &$module_row) function phpbb_module_reports_url($mode, $module_row)
{ {
return phpbb_extra_url(); return phpbb_extra_url();
} }

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

@ -28,9 +28,9 @@ class mcp_logs
var $u_action; var $u_action;
var $p_master; 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) function main($id, $mode)

4
phpBB/includes/mcp/mcp_main.php
View file

@ -28,9 +28,9 @@ class mcp_main
var $p_master; var $p_master;
var $u_action; 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) function main($id, $mode)

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

@ -28,9 +28,9 @@ class mcp_notes
var $p_master; var $p_master;
var $u_action; 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) 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 $p_master;
var $u_action; 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) function main($id, $mode)

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

@ -28,9 +28,9 @@ class mcp_queue
var $p_master; var $p_master;
var $u_action; 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) 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 $p_master;
var $u_action; 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) function main($id, $mode)

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

@ -28,9 +28,9 @@ class mcp_warn
var $p_master; var $p_master;
var $u_action; 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) function main($id, $mode)

4
phpBB/includes/ucp/ucp_main.php
View file

@ -28,9 +28,9 @@ class ucp_main
var $p_master; var $p_master;
var $u_action; 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) function main($id, $mode)

2
phpBB/phpbb/captcha/plugins/gd.php
View file

@ -51,7 +51,7 @@ class gd extends captcha_abstract
return 'CAPTCHA_GD'; return 'CAPTCHA_GD';
} }
function acp_page($id, &$module) function acp_page($id, $module)
{ {
global $user, $template, $phpbb_log, $request; global $user, $template, $phpbb_log, $request;
global $config; global $config;

2
phpBB/phpbb/captcha/plugins/gd_wave.php
View file

@ -33,7 +33,7 @@ class gd_wave extends captcha_abstract
return '\\phpbb\\captcha\\gd_wave'; return '\\phpbb\\captcha\\gd_wave';
} }
function acp_page($id, &$module) function acp_page($id, $module)
{ {
global $user; global $user;

2
phpBB/phpbb/captcha/plugins/nogd.php
View file

@ -33,7 +33,7 @@ class nogd extends captcha_abstract
return '\\phpbb\\captcha\\non_gd'; return '\\phpbb\\captcha\\non_gd';
} }
function acp_page($id, &$module) function acp_page($id, $module)
{ {
global $user; global $user;

4
phpBB/phpbb/captcha/plugins/qa.php
View file

@ -638,7 +638,7 @@ class qa
/** /**
* API function - The ACP backend, this marks the end of the easy methods * API function - The ACP backend, this marks the end of the easy methods
*/ */
function acp_page($id, &$module) function acp_page($id, $module)
{ {
global $config, $request, $phpbb_log, $template, $user; global $config, $request, $phpbb_log, $template, $user;
@ -776,7 +776,7 @@ class qa
/** /**
* This handles the list overview * This handles the list overview
*/ */
function acp_question_list(&$module) function acp_question_list($module)
{ {
global $db, $template; global $db, $template;

2
phpBB/phpbb/captcha/plugins/recaptcha.php
View file

@ -66,7 +66,7 @@ class recaptcha extends captcha_abstract
throw new \Exception('No generator class given.'); throw new \Exception('No generator class given.');
} }
function acp_page($id, &$module) function acp_page($id, $module)
{ {
global $config, $template, $user, $phpbb_log, $request; global $config, $template, $user, $phpbb_log, $request;

8
phpBB/phpbb/files/upload.php
View file

@ -261,7 +261,7 @@ class upload
* *
* @param filespec $file Instance of filespec class * @param filespec $file Instance of filespec class
*/ */
public function common_checks(&$file) public function common_checks($file)
{ {
// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form // Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0)) if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0))
@ -297,7 +297,7 @@ class upload
* *
* @return bool True if extension is allowed, false if not * @return bool True if extension is allowed, false if not
*/ */
public function valid_extension(&$file) public function valid_extension($file)
{ {
return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false; return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false;
} }
@ -310,7 +310,7 @@ class upload
* @return bool True if dimensions are valid or no constraints set, false * @return bool True if dimensions are valid or no constraints set, false
* if not * if not
*/ */
public function valid_dimensions(&$file) public function valid_dimensions($file)
{ {
if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height) if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height)
{ {
@ -350,7 +350,7 @@ class upload
* *
* @return bool True if content is valid, false if not * @return bool True if content is valid, false if not
*/ */
public function valid_content(&$file) public function valid_content($file)
{ {
return ($file->check_content($this->disallowed_content)); return ($file->check_content($this->disallowed_content));
} }

2
tests/upload/filespec_test.php
View file

@ -79,7 +79,7 @@ class phpbb_filespec_test extends phpbb_test_case
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
} }
private function set_reflection_property(&$class, $property_name, $value) private function set_reflection_property($class, $property_name, $value)
{ {
$property = new ReflectionProperty($class, $property_name); $property = new ReflectionProperty($class, $property_name);
$property->setAccessible(true); $property->setAccessible(true);