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

Merge branch 4.0 into master

Browse Source
This commit is contained in:
Thibaud Fabre
2016-05-25 17:21:08 +02:00
parent b96917f908 a57d2bb3e1
commit 1917b3dba3
71 changed files with 4409 additions and 2685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/record/exportElement.php
View File

@@ -68,8 +68,6 @@ class record_exportElement extends record_adapter
parent::__construct($app, $sbas_id, $record_id);
$this->get_actions($remain_hd);
return $this;
}
/**
@@ -270,8 +268,7 @@ class record_exportElement extends record_adapter
}
/**
*
* @return Array
* @return array
*/
public function get_orderable()
{
@@ -279,8 +276,7 @@ class record_exportElement extends record_adapter
}
/**
*
* @return Array
* @return array
*/
public function get_downloadable()
{