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

[ticket/16346] More fixes

Browse source 
PHPBB3-16346
This commit is contained in:
rubencm 2020-08-10 06:03:52 +00:00
parent 4156204419
commit 52b7125cce
6 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_styles.php
View file

@ -335,7 +335,7 @@ class acp_styles
$uninstalled = array();
foreach ($rows as $style)
{
$result = $this->uninstall_style($style, $delete_files);
$result = $this->uninstall_style($style);
if (is_string($result))
{

2
phpBB/includes/functions_messenger.php
View file

@ -469,7 +469,7 @@ class messenger
$domain = ($config['server_name']) ?: $request->server('SERVER_NAME', 'phpbb.generated');
return md5(unique_id(time())) . '@' . $domain;
return md5(unique_id()) . '@' . $domain;
}
/**

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

@ -235,7 +235,7 @@ abstract class captcha_abstract
global $db, $user;
$this->code = gen_rand_string_friendly(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
$this->confirm_id = md5(unique_id($user->ip));
$this->confirm_id = md5(unique_id());
$this->seed = hexdec(substr(unique_id(), 4, 10));
$this->solved = 0;
// compute $seed % 0x7fffffff

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

@ -442,7 +442,7 @@ class qa
{
return;
}
$this->confirm_id = md5(unique_id($user->ip));
$this->confirm_id = md5(unique_id());
$this->question = (int) array_rand($this->question_ids);
$sql = 'INSERT INTO ' . $this->table_qa_confirm . ' ' . $db->sql_build_array('INSERT', array(

6
phpBB/phpbb/config_php_file.php
View file

@ -42,8 +42,6 @@ class config_php_file
*/
protected $config_file;
private $defined_vars;
/**
* Constructor
*
@ -102,10 +100,10 @@ class config_php_file
{
if (!$this->config_loaded && file_exists($this->config_file))
{
$this->defined_vars = get_defined_vars();
$defined_vars = get_defined_vars();
require($this->config_file);
$this->config_data = array_diff_key(get_defined_vars(), $this->defined_vars);
$this->config_data = array_diff_key(get_defined_vars(), $defined_vars);
$this->config_loaded = true;
}

8
phpBB/phpbb/tree/nestedset.php
View file

@ -395,7 +395,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
$this->db->sql_transaction('begin');
$this->remove_subset($move_items, $current_parent, false, true);
$this->remove_subset($move_items, $current_parent, false);
if ($new_parent_id)
{
@ -414,7 +414,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
}
$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
if ($new_right_id > $current_parent[$this->column_right_id])
{
@ -493,7 +493,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
$this->db->sql_transaction('begin');
$this->remove_subset($move_items, $item, false, true);
$this->remove_subset($move_items, $item, false);
if ($new_parent_id)
{
@ -512,7 +512,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
throw new \OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
}
$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
if ($new_right_id > (int) $item[$this->column_right_id])
{