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

Fixed order in entry/update, fixed a lot of codestyle

Browse Source
This commit is contained in:
Andrey
2013-06-19 16:09:31 +02:00
parent c8b62c02db
commit 1764d5f5c4
31 changed files with 719 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/patch/320f.php
View File

@@ -127,7 +127,6 @@ class patch_320f implements patchInterface
$entry->addItem($item);
$item->setRecordId($record->get_record_id());
$item->setSbasId($record->get_sbas_id());
$item->setLastInFeedItem();
$app['EM']->persist($item);
} catch (NotFoundHttpException $e) {
@@ -164,12 +163,13 @@ class patch_320f implements patchInterface
protected function get_feed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink, Application $app)
{
$user_key = 'user_' . $user->get_id();
if ($homelink == '1')
if ($homelink == '1') {
$feed_key = 'feed_homelink';
elseif ($pub_restrict == '1')
} elseif ($pub_restrict == '1') {
$feed_key = 'feed_restricted';
else
} else {
$feed_key = 'feed_public';
}
if ( ! array_key_exists($user_key, self::$feeds) || ! isset(self::$feeds[$user_key][$feed_key])) {
if ($homelink == '1')
@@ -183,7 +183,6 @@ class patch_320f implements patchInterface
$publisher = new FeedPublisher();
$feed->setTitle('title');
$feed->setSubtitle('');
$feed->setIconUrl(false);
$feed->addPublisher($publisher);
$publisher->setFeed($feed);
$publisher->setOwner(true);