Empty commit

This commit is contained in:
Git 2014-09-20 08:00:28 +00:00
parent a5ebb19157
commit 457abfb8ce
3 changed files with 11 additions and 3 deletions

View File

@ -173,7 +173,7 @@ function generate_torrent_json($Caption, $Tag, $Details, $Limit) {
'groupId' => (int)$GroupID, 'groupId' => (int)$GroupID,
'artist' => $TruncArtist, 'artist' => $TruncArtist,
'groupName' => $GroupName, 'groupName' => $GroupName,
'groupCategory' => (int)$GroupCategory, 'groupCategory' => (int)$GroupCategoryID,
'groupYear' => (int)$GroupYear, 'groupYear' => (int)$GroupYear,
'remasterTitle' => $RemasterTitle, 'remasterTitle' => $RemasterTitle,
'format' => $Format, 'format' => $Format,
@ -189,6 +189,8 @@ function generate_torrent_json($Caption, $Tag, $Details, $Limit) {
'leechers' => (int)$Leechers, 'leechers' => (int)$Leechers,
'data' => (int)$Data, 'data' => (int)$Data,
'size' => (int)$Size, 'size' => (int)$Size,
'wikiImage' => $WikiImage,
'releaseType' => $ReleaseType,
); );
} }

View File

@ -62,6 +62,8 @@
$JsonMusicInfo = null; $JsonMusicInfo = null;
} }
$TagList = explode('|', $TorrentDetails['GROUP_CONCAT(DISTINCT tags.Name SEPARATOR \'|\')']);
$JsonTorrentDetails = array( $JsonTorrentDetails = array(
'wikiBody' => Text::full_format($TorrentDetails['WikiBody']), 'wikiBody' => Text::full_format($TorrentDetails['WikiBody']),
'wikiImage' => $TorrentDetails['WikiImage'], 'wikiImage' => $TorrentDetails['WikiImage'],
@ -76,7 +78,8 @@
'time' => $TorrentDetails['Time'], 'time' => $TorrentDetails['Time'],
'vanityHouse' => $TorrentDetails['VanityHouse'] == 1, 'vanityHouse' => $TorrentDetails['VanityHouse'] == 1,
'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID), 'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
'musicInfo' => $JsonMusicInfo 'musicInfo' => $JsonMusicInfo,
'tags' => $TagList
); );
$Torrent = $TorrentList[$TorrentID]; $Torrent = $TorrentList[$TorrentID];

View File

@ -56,6 +56,8 @@
$JsonMusicInfo = null; $JsonMusicInfo = null;
} }
$TagList = explode('|', $TorrentDetails['GROUP_CONCAT(DISTINCT tags.Name SEPARATOR \'|\')']);
$JsonTorrentDetails = array( $JsonTorrentDetails = array(
'wikiBody' => Text::full_format($TorrentDetails['WikiBody']), 'wikiBody' => Text::full_format($TorrentDetails['WikiBody']),
'wikiImage' => $TorrentDetails['WikiImage'], 'wikiImage' => $TorrentDetails['WikiImage'],
@ -70,7 +72,8 @@
'time' => $TorrentDetails['Time'], 'time' => $TorrentDetails['Time'],
'vanityHouse' => ($TorrentDetails['VanityHouse'] == 1), 'vanityHouse' => ($TorrentDetails['VanityHouse'] == 1),
'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID), 'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
'musicInfo' => $JsonMusicInfo 'musicInfo' => $JsonMusicInfo,
'tags' => $TagList
); );
$JsonTorrentList = array(); $JsonTorrentList = array();