aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/events.md1
-rw-r--r--phpBB/includes/acp/acp_extensions.php2
-rw-r--r--phpBB/phpbb/session.php4
3 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f14ee69cc1..fb782ee452 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -172,7 +172,6 @@ acp_group_options_before
* Since: 3.1.0-b4
* Purpose: Add additional options to group settings (before GROUP_FOUNDER_MANAGE)
-
acp_groups_find_username_append
===
* Location: adm/style/acp_groups.html
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index f805eafeba..2929de3c4f 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -38,7 +38,7 @@ class acp_extensions
private $phpbb_container;
private $php_ini;
- function main()
+ function main($id, $mode)
{
// Start the page
global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher, $phpbb_container;
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 9e1548bf76..38e40ba29e 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -99,8 +99,8 @@ class session
else
{
// current directory within the phpBB root (for example: adm)
- $root_dirs = explode('/', str_replace('\\', '/', filesystem_helper::realpath($root_path)));
- $page_dirs = explode('/', str_replace('\\', '/', filesystem_helper::realpath('./')));
+ $root_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath($root_path)));
+ $page_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath('./')));
}
$intersection = array_intersect_assoc($root_dirs, $page_dirs);