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

Use Guzzle\Http\Url for medias

Browse Source
This commit is contained in:
Romain Neutron
2014-02-26 16:50:14 +01:00
parent 55d7366fd7
commit 7f2be7d9aa
15 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/API/V1/adapter.php
View File

@@ -1728,6 +1728,9 @@ class API_V1_adapter extends API_V1_Abstract
*/
protected function list_permalink(media_Permalink_Adapter $permalink, registryInterface $registry)
{
$downloadUrl = $permalink->get_url();
$downloadUrl->getQuery()->set('download', '1');
return array(
'created_on' => $permalink->get_created_on()->format(DATE_ATOM),
'id' => $permalink->get_id(),
@@ -1735,8 +1738,8 @@ class API_V1_adapter extends API_V1_Abstract
'label' => $permalink->get_label(),
'updated_on' => $permalink->get_last_modified()->format(DATE_ATOM),
'page_url' => $permalink->get_page(),
'download_url' => $permalink->get_url() . '&download',
'url' => $permalink->get_url()
'download_url' => (string) $downloadUrl,
'url' => (string) $permalink->get_url()
);
}