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 pull request #76 from nlegoff/fix_dm_upload_Dev

Browse Source 
fix upload to dailymotion throught phraseanet bridge
This commit is contained in:
Romain
2012-05-04 07:26:51 -07:00
parent 157d99ed5d 243947a7c6
commit ad59dbcb36
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
View File

@@ -379,11 +379,12 @@ class Bridge implements ControllerProviderInterface
$route->grep_records($account->get_api()->acceptable_records()); $route->grep_records($account->get_api()->acceptable_records());
$params = array( $params = array(
'route' => $route 'route' => $route
, 'account' => $account , 'account' => $account
, 'error_message' => $app['request']->get('error') , 'error_message' => $app['request']->get('error')
, 'notice_message' => $app['request']->get('notice') , 'notice_message' => $app['request']->get('notice')
, 'adapter_action' => 'upload' , 'constraint_errors' => null
, 'adapter_action' => 'upload'
); );
$html = $twig->render( $html = $twig->render(

1
lib/classes/Bridge/Api/Dailymotion.class.php
View File

@@ -637,7 +637,6 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
/** /**
* @todo Retieve thumb * @todo Retieve thumb
*/ */
return new Bridge_Api_Dailymotion_Container($entry, $object, ''); return new Bridge_Api_Dailymotion_Container($entry, $object, '');
break; break;
default: default: