diff options
author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 11:56:36 -0500 |
---|---|---|
committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 11:56:36 -0500 |
commit | d9fdf41ad8638df5ff565ad097982f13f004e5d0 (patch) | |
tree | 7b2c14d7b5db7482886180060e260db61ab9cf3c /tests/mock | |
parent | 4c00c77739cc20db26d5f87bf26a9a953bc92d3a (diff) | |
parent | f74a04c976c96864947bb91304abb3b92161f161 (diff) | |
download | forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar.gz forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar.bz2 forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.tar.xz forums-d9fdf41ad8638df5ff565ad097982f13f004e5d0.zip |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Joseph Warner (187) and others
# Via Andreas Fischer (2) and others
* 'develop' of github.com:phpbb/phpbb3: (189 commits)
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[feature/oauth] Fix tabindex
[feature/oauth] Fix bug on ucp_auth_link related to error display
[feature/oauth] More small fixes
[feature/oauth] More minor changes from review
[feature/oauth] Fix small bug introduced by update in OAuth library
[feature/oauth] Fix small issues on ucp pages
[feature/oauth] Fix typo in OAuth logout method
[feature/oauth] Make token storage service ignorant
[feature/oauth] Update oauth::logout() to use clearAllTokens()
[feature/oauth] Update storage implementation due to inteface change
[feature/oauth] Update lusitanian/oauth to stable branch
[feature/oauth] Update comment on oauth service exception
[feature/oauth] Forgot to remove placeholder comment
[feature/oauth] OAuth service exception
[feature/oauth] A few more minor changes
[feature/oauth] Changes due to code review
[feature/oauth] Fix redirects
[feature/oauth] Fix issues on ucp_login_link from review
...
Diffstat (limited to 'tests/mock')
-rw-r--r-- | tests/mock/request.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/mock/request.php b/tests/mock/request.php index 2a272fc03b..d671621460 100644 --- a/tests/mock/request.php +++ b/tests/mock/request.php @@ -74,6 +74,11 @@ class phpbb_mock_request implements phpbb_request_interface return array_keys($this->data[$super_global]); } + public function get_super_global($super_global = phpbb_request_interface::REQUEST) + { + return $this->data[$super_global]; + } + /* custom methods */ public function set_header($header_name, $value) |