makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16052] Fix issues caused by merges

Browse source 
PHPBB3-16052
This commit is contained in:
Marc Alexander 2019-05-11 13:40:47 +02:00
parent 90f8498a44
commit 3f33d89572
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/events.md
View file

@ -172,7 +172,6 @@ acp_group_options_before
* Since: 3.1.0-b4 * Since: 3.1.0-b4
* Purpose: Add additional options to group settings (before GROUP_FOUNDER_MANAGE) * Purpose: Add additional options to group settings (before GROUP_FOUNDER_MANAGE)
acp_groups_find_username_append acp_groups_find_username_append
=== ===
* Location: adm/style/acp_groups.html * Location: adm/style/acp_groups.html

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

@ -38,7 +38,7 @@ class acp_extensions
private $phpbb_container; private $phpbb_container;
private $php_ini; private $php_ini;
function main() function main($id, $mode)
{ {
// Start the page // Start the page
global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher, $phpbb_container; global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher, $phpbb_container;

4
phpBB/phpbb/session.php
View file

@ -99,8 +99,8 @@ class session
else else
{ {
// current directory within the phpBB root (for example: adm) // current directory within the phpBB root (for example: adm)
$root_dirs = explode('/', str_replace('\\', '/', filesystem_helper::realpath($root_path))); $root_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath($root_path)));
$page_dirs = explode('/', str_replace('\\', '/', filesystem_helper::realpath('./'))); $page_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath('./')));
} }
$intersection = array_intersect_assoc($root_dirs, $page_dirs); $intersection = array_intersect_assoc($root_dirs, $page_dirs);

1
tests/console/user/base.php
View file

@ -20,6 +20,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
protected $log; protected $log;
protected $passwords_manager; protected $passwords_manager;
protected $command_name; protected $command_name;
/** @var Symfony\Component\Console\Helper\QuestionHelper */
protected $question; protected $question;
protected $user_loader; protected $user_loader;
protected $phpbb_root_path; protected $phpbb_root_path;

6
tests/console/user/delete_test.php
View file

@ -45,7 +45,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
$this->assertEquals(3, $this->get_user_id('Test')); $this->assertEquals(3, $this->get_user_id('Test'));
$this->question->setInputStream($this->getInputStream("yes\n")); $command_tester->setInputs(['yes', '']);
$command_tester->execute(array( $command_tester->execute(array(
'command' => $this->command_name, 'command' => $this->command_name,
@ -63,7 +63,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
$this->assertNull($this->get_user_id('Foo')); $this->assertNull($this->get_user_id('Foo'));
$this->question->setInputStream($this->getInputStream("yes\n")); $command_tester->setInputs(['yes', '']);
$command_tester->execute(array( $command_tester->execute(array(
'command' => $this->command_name, 'command' => $this->command_name,
@ -80,7 +80,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
$this->assertEquals(3, $this->get_user_id('Test')); $this->assertEquals(3, $this->get_user_id('Test'));
$this->question->setInputStream($this->getInputStream("no\n")); $command_tester->setInputs(['no', '']);
$command_tester->execute(array( $command_tester->execute(array(
'command' => $this->command_name, 'command' => $this->command_name,