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

Merge branch '3.8'

Browse Source 
Conflicts:
	bin/console
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/User/Adapter.php
	lib/classes/media/Permalink/Adapter.php
	lib/classes/media/abstract.php
	lib/classes/media/subdef.php
	lib/classes/p4file.php
	lib/classes/record/preview.php
	lib/conf.d/_GV_template.inc
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
	tests/classes/media/Permalink/media_Permalink_AdapterTest.php
This commit is contained in:
Romain Neutron
2014-03-03 17:00:17 +01:00
parent 191979d20a b8d2702975
commit 1713c23c59
39 changed files with 1051 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,9 @@ class XSendFileFactory
}
/**
* Returns a new instance of XSendFileModeInterface.
* Returns a new instance of ModeInterface.
*
* @return null|ModeInterface
* @return ModeInterface
*
* @throws InvalidArgumentException if mode type is unknown
*/