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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
This commit is contained in:
Romain Neutron
2014-02-28 19:37:54 +01:00
parent 1497b6413a 871b19c407
commit c641ab7841
10 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/DailymotionWithoutOauth2.php
View File

@@ -64,7 +64,7 @@ class DailymotionWithoutOauth2 extends Dailymotion
*
* @return String the resulting URL
*/
public function uploadFileWithToken($filePath, $oauth_token)
public function sendFile($filePath, $oauth_token)
{
$result = $this->call('file.upload', [], $oauth_token);
$timeout = $this->timeout;