summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGit <git@what.cd>2014-09-20 08:00:28 +0000
committerGit <git@what.cd>2014-09-20 08:00:28 +0000
commit457abfb8ce71b54fc5d84811a432190521ddcf7d (patch)
treeba8e9b3ed9f61c767df85acff800f2be2c77fb57
parenta5ebb191572fc57227985d72b16ce1f39f7f9c27 (diff)
downloadGazelle-457abfb8ce71b54fc5d84811a432190521ddcf7d.zip
Gazelle-457abfb8ce71b54fc5d84811a432190521ddcf7d.tar.gz
Gazelle-457abfb8ce71b54fc5d84811a432190521ddcf7d.tar.bz2
Empty commit
-rw-r--r--sections/ajax/top10/torrents.php4
-rw-r--r--sections/ajax/torrent.php5
-rw-r--r--sections/ajax/torrentgroup.php5
3 files changed, 11 insertions, 3 deletions
diff --git a/sections/ajax/top10/torrents.php b/sections/ajax/top10/torrents.php
index 1869e45..2c4625d 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 67d5111..dedafee 100644
--- a/sections/ajax/torrent.php
+++ b/sections/ajax/torrent.php
@@ -62,6 +62,8 @@ else {
$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 @@ $JsonTorrentDetails = array(
'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 336ac82..e95658c 100644
--- a/sections/ajax/torrentgroup.php
+++ b/sections/ajax/torrentgroup.php
@@ -56,6 +56,8 @@ if ($CategoryName == 'Music') {
$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 @@ $JsonTorrentDetails = array(
'time' => $TorrentDetails['Time'],
'vanityHouse' => ($TorrentDetails['VanityHouse'] == 1),
'isBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
- 'musicInfo' => $JsonMusicInfo
+ 'musicInfo' => $JsonMusicInfo,
+ 'tags' => $TagList
);
$JsonTorrentList = array();