From 457abfb8ce71b54fc5d84811a432190521ddcf7d Mon Sep 17 00:00:00 2001 From: Git Date: Sat, 20 Sep 2014 08:00:28 +0000 Subject: [PATCH] Empty commit --- sections/ajax/top10/torrents.php | 4 +++- sections/ajax/torrent.php | 5 ++++- sections/ajax/torrentgroup.php | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sections/ajax/top10/torrents.php b/sections/ajax/top10/torrents.php index 1869e450..2c4625d9 100644 --- a/sections/ajax/top10/torrents.php +++ b/sections/ajax/top10/torrents.php @@ -173,7 +173,7 @@ function generate_torrent_json($Caption, $Tag, $Details, $Limit) { 'groupId' => (int)$GroupID, 'artist' => $TruncArtist, 'groupName' => $GroupName, - 'groupCategory' => (int)$GroupCategory, + 'groupCategory' => (int)$GroupCategoryID, 'groupYear' => (int)$GroupYear, 'remasterTitle' => $RemasterTitle, 'format' => $Format, @@ -189,6 +189,8 @@ function generate_torrent_json($Caption, $Tag, $Details, $Limit) { 'leechers' => (int)$Leechers, 'data' => (int)$Data, 'size' => (int)$Size, + 'wikiImage' => $WikiImage, + 'releaseType' => $ReleaseType, ); } diff --git a/sections/ajax/torrent.php b/sections/ajax/torrent.php index 67d51114..dedafeea 100644 --- a/sections/ajax/torrent.php +++ b/sections/ajax/torrent.php @@ -62,6 +62,8 @@ $JsonMusicInfo = null; } +$TagList = explode('|', $TorrentDetails['GROUP_CONCAT(DISTINCT tags.Name SEPARATOR \'|\')']); + $JsonTorrentDetails = array( 'wikiBody' => Text::full_format($TorrentDetails['WikiBody']), 'wikiImage' => $TorrentDetails['WikiImage'], @@ -76,7 +78,8 @@ 'time' => $TorrentDetails['Time'], 'vanityHouse' => $TorrentDetails['VanityHouse'] == 1, 'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID), - 'musicInfo' => $JsonMusicInfo + 'musicInfo' => $JsonMusicInfo, + 'tags' => $TagList ); $Torrent = $TorrentList[$TorrentID]; diff --git a/sections/ajax/torrentgroup.php b/sections/ajax/torrentgroup.php index 336ac82a..e95658cd 100644 --- a/sections/ajax/torrentgroup.php +++ b/sections/ajax/torrentgroup.php @@ -56,6 +56,8 @@ $JsonMusicInfo = null; } +$TagList = explode('|', $TorrentDetails['GROUP_CONCAT(DISTINCT tags.Name SEPARATOR \'|\')']); + $JsonTorrentDetails = array( 'wikiBody' => Text::full_format($TorrentDetails['WikiBody']), 'wikiImage' => $TorrentDetails['WikiImage'], @@ -70,7 +72,8 @@ 'time' => $TorrentDetails['Time'], 'vanityHouse' => ($TorrentDetails['VanityHouse'] == 1), 'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID), - 'musicInfo' => $JsonMusicInfo + 'musicInfo' => $JsonMusicInfo, + 'tags' => $TagList ); $JsonTorrentList = array();