From 87d6f98db31456ecfc763602fe6e28b051f93fb9 Mon Sep 17 00:00:00 2001 From: Git Date: Tue, 26 Feb 2013 08:00:42 +0000 Subject: [PATCH] Empty commit --- classes/class_tags.php | 10 ++++++++-- sections/artist/artist.php | 9 +++++++-- sections/artist/artist_rearrange.php | 2 +- sections/better/snatch.php | 3 +-- sections/better/transcode.php | 2 +- sections/better/upload.php | 3 +-- sections/bookmarks/torrents.php | 2 +- sections/collages/collage.php | 4 +--- sections/upload/generate_extra_torrents.php | 2 +- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/classes/class_tags.php b/classes/class_tags.php index 3f7f82dd..c0505439 100644 --- a/classes/class_tags.php +++ b/classes/class_tags.php @@ -128,7 +128,9 @@ public static function sorted() { */ public function format($Link = 'torrents.php?taglist=') { foreach ($this->Tags as $Tag) { - $this->TagLink[] = '' . $Tag . ''; + if (empty($this->TagLink[$Tag])) { + $this->TagLink[$Tag] = '' . $Tag . ''; + } } return implode(', ', $this->TagLink); } @@ -138,8 +140,12 @@ public function format($Link = 'torrents.php?taglist=') { * @param int $Max Max number of items to get */ public static function format_top($Max = 5, $Link = 'torrents.php?taglist=') { + if (empty(self::$All)) { ?> +
  • No torrent tags
    • + $Total) { ?> -
  • ()
    • +
  • ()
    • Tags @@ -752,11 +752,16 @@ function compare($X, $Y){ $Row = ($Row == 'a') ? 'b' : 'a'; $Tags = get_request_tags($RequestID); + $ReqTagList = array(); + foreach($Tags as $TagID => $TagName) { + $ReqTagList[] = "".display_str($TagName).""; + } + $ReqTagList = implode(', ', $ReqTagList); ?> -
    format('requests.php?tags=')?>
    +
    diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php index c460fbe3..feaf8684 100644 --- a/sections/artist/artist_rearrange.php +++ b/sections/artist/artist_rearrange.php @@ -450,7 +450,7 @@ function display_name($ReleaseType) {
    Tags
    diff --git a/sections/better/snatch.php b/sections/better/snatch.php index 4e32d5a2..240a5280 100644 --- a/sections/better/snatch.php +++ b/sections/better/snatch.php @@ -173,7 +173,7 @@ } else { $ArtistNames = ''; } - + $TorrentTags = new Tags($GroupInfo['TagList']); foreach ($Editions as $RemIdent => $Edition) { if (!$Edition['FlacID'] || count($Edition['Formats']) == 3) { continue; @@ -205,7 +205,6 @@ if (!empty($Edition['RemasterYear'])) { $ExtraInfo .= ' - '; } - $TorrentTags = new Tags($GroupInfo['TagList']); $ExtraInfo .= implode(' / ', $EditionInfo); ?> diff --git a/sections/better/transcode.php b/sections/better/transcode.php index 6caf6f7b..def946b8 100644 --- a/sections/better/transcode.php +++ b/sections/better/transcode.php @@ -128,6 +128,7 @@ } else { $ArtistNames = ''; } + $TorrentTags = new Tags($GroupInfo['TagList']); foreach ($Editions as $RemIdent => $Edition) { if (!$Edition['FlacID'] //no FLAC in this group || !empty($Edition['Formats']) && $_GET['type'] == 3 //at least one transcode present when we only wanted groups containing no transcodes at all (type 3) @@ -166,7 +167,6 @@ if (!empty($Edition['RemasterYear'])) { $ExtraInfo .= ' - '; } - $TorrentTags = new Tags($GroupInfo['TagList']); $ExtraInfo .= implode(' / ', $EditionInfo); ?> > diff --git a/sections/better/upload.php b/sections/better/upload.php index b6cfa506..8815483f 100644 --- a/sections/better/upload.php +++ b/sections/better/upload.php @@ -152,7 +152,7 @@ } else { $ArtistNames = ''; } - + $TorrentTags = new Tags($TagList); foreach ($Editions as $RemIdent => $Edition) { if (!$Edition['FlacID'] || count($Edition['Formats']) == 3) { continue; @@ -184,7 +184,6 @@ if (!empty($Edition['RemasterYear'])) { $ExtraInfo .= ' - '; } - $TorrentTags = new Tags($TagList); $ExtraInfo .= implode(' / ', $EditionInfo); ?> diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php index 008aaa4f..266e3bac 100644 --- a/sections/bookmarks/torrents.php +++ b/sections/bookmarks/torrents.php @@ -299,7 +299,7 @@ function compare($X, $Y){
    Top tags
      -format_top(5) ?> +
    diff --git a/sections/collages/collage.php b/sections/collages/collage.php index d76b0bc5..d8e2950f 100644 --- a/sections/collages/collage.php +++ b/sections/collages/collage.php @@ -466,9 +466,7 @@ function compare($X, $Y){
      format_top(5, 'collages.php?action=search&tags='); - } + Tags::format_top(5, 'collages.php?action=search&tags='); ?>
    diff --git a/sections/upload/generate_extra_torrents.php b/sections/upload/generate_extra_torrents.php index c1260122..8fe2a727 100644 --- a/sections/upload/generate_extra_torrents.php +++ b/sections/upload/generate_extra_torrents.php @@ -16,7 +16,7 @@ // File list and size list($ExtraTotalSize, $ExtraFileList) = $ExtraTor->file_list(); - $ExtraDirName = isset($ExtraTor->Val['info']->Val['files']) ? Format::make_utf8($ExtraTor->get_name()) : ""; + $ExtraDirName = isset($ExtraTor->Dec['info']['files']) ? Format::make_utf8($ExtraTor->get_name()) : ""; $ExtraTmpFileList = array(); foreach ($ExtraFileList as $ExtraFile) {