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

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/classes/patch/370alpha7a.php
View File

@@ -110,7 +110,7 @@ class patch_370alpha7a extends patchAbstract
$media = $app->getMediaFromUri($filePath);
$collection = \collection::get_from_base_id($app, $row['base_id']);
$collection = \collection::getByBaseId($app, $row['base_id']);
$borderFile = new \Alchemy\Phrasea\Border\File($app, $media, $collection);

2
lib/classes/patch/390alpha13a.php
View File

@@ -91,7 +91,7 @@ class patch_390alpha13a implements patchInterface
}
try {
$collection = \collection::get_from_base_id($app, $row['base_id']);
$collection = \collection::getByBaseId($app, $row['base_id']);
} catch (\Exception $e) {
$app['monolog']->addInfo(sprintf(
'Patch %s : Registration for user (%s) could not be turn into doctrine entity as base with id (%s) could not be found.',