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

Remove some deprecated methods calls

Browse Source
This commit is contained in:
Benoît Burnichon
2016-03-06 23:05:55 +01:00
parent ba4274eb28
commit 6cdc9d7a31
77 changed files with 322 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ class PermalinkController extends AbstractDelivery
$watermark = $stamp = false;
if ($this->authentication->isAuthenticated()) {
$watermark = !$this->acl->get($this->authentication->getUser())->has_right_on_base($record->get_base_id(), 'nowatermark');
$watermark = !$this->acl->get($this->authentication->getUser())->has_right_on_base($record->getBaseId(), 'nowatermark');
if ($watermark) {
/** @var BasketElementRepository $repository */
@@ -138,7 +138,7 @@ class PermalinkController extends AbstractDelivery
return $this->deliverContentWithCaptionLink($request, $record, $subdef, $watermark, $stamp, $token);
}
$collection = \collection::getByBaseId($this->app, $record->get_base_id());
$collection = \collection::getByBaseId($this->app, $record->getBaseId());
switch ($collection->get_pub_wm()) {
default:
case 'none':
@@ -169,8 +169,8 @@ class PermalinkController extends AbstractDelivery
$response = $this->deliverContent($request, $record, $subdef, $watermark, $stamp);
$response->headers->set('Link', $this->app->url("permalinks_caption", [
'sbas_id' => $record->get_sbas_id(),
'record_id' => $record->get_record_id(),
'sbas_id' => $record->getDataboxId(),
'record_id' => $record->getRecordId(),
'token' => $token,
]));