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

Merge pull request #715 from romainneutron/fix-1550

Browse Source 
[3.8] Fix #1550 : Remove feed entry items that are not related to a record
This commit is contained in:
Romain Neutron
2013-10-25 10:05:09 -07:00
parent 34ee0cd507 ffb9ac73d0
commit aa95bfdba2
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/classes/Feed/Entry/Item.php
View File

@@ -10,6 +10,7 @@
*/
use Alchemy\Phrasea\Application;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
*
@@ -273,9 +274,26 @@ class Feed_Entry_Item implements Feed_Entry_ItemInterface, cache_cacheableInterf
}
if (!isset($items[$row['item']])) {
$item = new self($app['phraseanet.appbox'], $entries[$row['entry']], $row['item']);
try {
$item = new self($app['phraseanet.appbox'], $entries[$row['entry']], $row['item']);
$record = $item->get_record();
} catch (NotFoundHttpException $e) {
$sql = 'DELETE FROM feed_entry_elements WHERE id = :id';
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute(array(':id' => $row['item']));
$stmt->closeCursor();
if (null !== $preview = $item->get_record()->get_subdef('preview')) {
continue;
} catch (\Exception_Record_AdapterNotFound $e) {
$sql = 'DELETE FROM feed_entry_elements WHERE id = :id';
$stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute(array(':id' => $row['item']));
$stmt->closeCursor();
continue;
}
if (null !== $preview = $record->get_subdef('preview')) {
if (null !== $permalink = $preview->get_permalink()) {
$items[$row['item']] = $item;