aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-02 17:55:57 -0700
committerCesar G <prototech91@gmail.com>2014-05-02 17:55:57 -0700
commit386aac3a85313804d96ba7ff90a949e0d475a1da (patch)
tree8f23a49e8519b7a90a4a8ac1a648f2694a08d080
parent57927ef8eaf73a501570e9a6e25541402ae951af (diff)
parentb07ea805d47f2a2b9d1d1de941164e3de3d13d9c (diff)
downloadforums-386aac3a85313804d96ba7ff90a949e0d475a1da.tar
forums-386aac3a85313804d96ba7ff90a949e0d475a1da.tar.gz
forums-386aac3a85313804d96ba7ff90a949e0d475a1da.tar.bz2
forums-386aac3a85313804d96ba7ff90a949e0d475a1da.tar.xz
forums-386aac3a85313804d96ba7ff90a949e0d475a1da.zip
Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeus
* VSEphpbb/ticket/10521: [ticket/10521] Fix broken tests using set_cookie
-rw-r--r--tests/mock/session_testable.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index d81ae3163e..a2a403727b 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -20,7 +20,7 @@ class phpbb_mock_session_testable extends \phpbb\session
{
private $_cookies = array();
- public function set_cookie($name, $data, $time)
+ public function set_cookie($name, $data, $time, $httponly = true)
{
$this->_cookies[$name] = array($data, $time);
}