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

Fix #1085 : Feed load with a deleted publisher fails

Browse Source
This commit is contained in:
Romain Neutron
2013-01-31 13:46:15 +01:00
parent ec53fbd0ee
commit 0c2a4ca13a
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/Feed/Entry/Adapter.class.php
View File

@@ -373,8 +373,13 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
*/
public function get_publisher()
{
if ( ! $this->publisher instanceof Feed_Publisher_Adapter)
$this->publisher = new Feed_Publisher_Adapter($this->appbox, $this->publisher_id);
if ( ! $this->publisher instanceof Feed_Publisher_Adapter) {
try {
$this->publisher = new Feed_Publisher_Adapter($this->appbox, $this->publisher_id);
} catch (\Exception_Feed_PublisherNotFound $e) {
}
}
return $this->publisher;
}
@@ -386,7 +391,13 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa
*/
public function is_publisher(User_adapter $user)
{
return $user->get_id() === $this->get_publisher()->get_user()->get_id();
$publisher = $this->get_publisher();
if ($publisher instanceof Feed_Publisher_Interface) {
return $user->get_id() === $publisher->get_user()->get_id();
}
return false;
}
/**