hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2014-02-28 00:28:06 +01:00
parent aa6045104b 5adc7604bb
commit 2df0f9d659
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Http/XSendFile/XSendFileFactory.php
View File

@@ -66,9 +66,9 @@ class XSendFileFactory
*
* @throws InvalidArgumentException if mode type is unknown
*/
public function getMode($throwException = false)
public function getMode($throwException = false, $forceMode = false)
{
if (false === $this->enabled) {
if (false === $this->enabled && true !== $forceMode) {
return new NullMode();
}