diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-17 18:10:58 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-17 18:10:58 +0200 |
| commit | 1d7f8f81935157867539d4c3991c5922afec8b55 (patch) | |
| tree | c49819fc02fafc02037ffe37ef692ee9bf604d25 | |
| parent | 9d8ac2b0ceb24dd14df61d083505941afb1b52c4 (diff) | |
| download | forums-1d7f8f81935157867539d4c3991c5922afec8b55.tar forums-1d7f8f81935157867539d4c3991c5922afec8b55.tar.gz forums-1d7f8f81935157867539d4c3991c5922afec8b55.tar.bz2 forums-1d7f8f81935157867539d4c3991c5922afec8b55.tar.xz forums-1d7f8f81935157867539d4c3991c5922afec8b55.zip | |
[ticket/11700] Get functional tests running after develop merge
PHPBB3-11700
| -rw-r--r-- | phpBB/config/services.yml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/provider_interface.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index f029ec40a3..e33db0c2bc 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -258,7 +258,7 @@ services: class: phpbb\request\request symfony_request: - class: phpbb_symfony_request + class: phpbb\symfony_request arguments: - @request diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index 31368a0286..1bb209c821 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -134,7 +134,7 @@ interface provider_interface * * @param array $data An array corresponding to * \phpbb\session::data - * @param boolean $new_session True for a new \session, false for no new + * @param boolean $new_session True for a new session, false for no new * session. */ public function logout($data, $new_session); diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 543369a3ab..2baf61043d 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -403,7 +403,7 @@ class session $session_expired = false; // Check whether the session is still valid if we have one - $method = basename(trim($config['auth_method'])); + $method = basename(trim($config['auth_method'])); $provider = $phpbb_container->get('auth.provider.' . $method); |