merge master

This commit is contained in:
Nicolas Le Goff
2012-04-27 18:49:38 +02:00
4 changed files with 60 additions and 4 deletions

View File

@@ -943,6 +943,8 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$base_id = $collection->get_base_id();
$user->ACL()->give_access_to_base(array($base_id));
set_exportorder::set_order_admins(array($user->get_id()), $base_id);
$rights = array(
'canputinalbum' => '1'
, 'candwnldhd' => '1'