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

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-08-11 22:53:13 +02:00
parent 2899f152fb
commit 4fa1f613e4
35 changed files with 378 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/set/export.php
View File

@@ -778,7 +778,7 @@ class set_export extends set_abstract
$log["shortXml"] = $app['serializer.caption']->serialize($record_object->get_caption(), CaptionSerializer::SERIALIZE_XML);
$tmplog[$record_object->get_base_id()][] = $log;
if (!$anonymous && $o == 'document' && null !== $app['authentication']->getUser()) {
$ $app['acl']->get($app['authentication']->getUser())->remove_remaining($record_object->get_base_id());
$app['acl']->get($app['authentication']->getUser())->remove_remaining($record_object->get_base_id());
}
}