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

4
lib/Alchemy/Phrasea/Controller/Admin/FeedController.php
View File

@@ -56,7 +56,7 @@ class FeedController extends Controller
if ($request->request->get('public') == '1') {
$feed->setIsPublic(true);
} elseif ($request->request->get('base_id')) {
$feed->setCollection(\collection::get_from_base_id($this->app, $request->request->get('base_id')));
$feed->setCollection(\collection::getByBaseId($this->app, $request->request->get('base_id')));
}
$publisher->setFeed($feed);
@@ -106,7 +106,7 @@ class FeedController extends Controller
}
try {
$collection = \collection::get_from_base_id($this->app, $request->request->get('base_id'));
$collection = \collection::getByBaseId($this->app, $request->request->get('base_id'));
} catch (\Exception $e) {
$collection = null;
}