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

Merge branch 'clean-boxes' into merge-clean-boxes

Browse Source
This commit is contained in:
Thibaud Fabre
2016-01-06 19:53:43 +01:00
parent e3f49db7b6 232b72269a
commit c92d5da9fe
56 changed files with 2546 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/PermalinkController.php
View File

@@ -132,7 +132,7 @@ class PermalinkController extends AbstractDelivery
return $this->deliverContentWithCaptionLink($request, $record, $subdef, $watermark, $stamp, $token);
}
$collection = \collection::get_from_base_id($this->app, $record->get_base_id());
$collection = \collection::getByBaseId($this->app, $record->get_base_id());
switch ($collection->get_pub_wm()) {
default:
case 'none':