Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/10521] Fix broken tests using set_cookie
This commit is contained in:
Cesar G 2014-05-02 17:56:23 -07:00
commit 9b2ecf721b

View file

@ -20,7 +20,7 @@ class phpbb_mock_session_testable extends \phpbb\session
{ {
private $_cookies = array(); 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); $this->_cookies[$name] = array($data, $time);
} }