Empty commit

This commit is contained in:
Git 2014-04-22 08:00:44 +00:00
parent 083f25a8e4
commit 58e172e2e2
5 changed files with 19 additions and 18 deletions

View File

@ -202,7 +202,7 @@ public static function display_artist($Artist, $MakeLink = true, $Escape = true)
if ($MakeLink && !$Escape) {
error('Invalid parameters to Artists::display_artist()');
} elseif ($MakeLink) {
return '<a href="artist.php?id='.$Artist['id'].'">'.display_str($Artist['name']).'</a>';
return '<a href="artist.php?id='.$Artist['id'].'" dir="ltr">'.display_str($Artist['name']).'</a>';
} elseif ($Escape) {
return display_str($Artist['name']);
} else {

View File

@ -476,6 +476,9 @@ function compare($X, $Y) {
//----------------- End building list and getting stats
// Comments (must be loaded before View::show_header so that subscriptions and quote notifications are handled properly)
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('artist', $ArtistID);
View::show_header($Name, 'browse,requests,bbcode,comments,voting,recommend,subscriptions');
?>
<div class="thin">
@ -795,11 +798,11 @@ function compare($X, $Y) {
if ($CategoryName == 'Music') {
$ArtistForm = Requests::get_artists($RequestID);
$ArtistLink = Artists::display_artists($ArtistForm, true, true);
$FullName = $ArtistLink."<a href=\"requests.php?action=view&amp;id=$RequestID\">$Title [$Request[Year]]</a>";
$FullName = $ArtistLink."<a href=\"requests.php?action=view&amp;id=$RequestID\"><span dir=\"ltr\">$Title</span> [$Request[Year]]</a>";
} elseif ($CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') {
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Title [$Request[Year]]</a>";
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\"><span dir=\"ltr\">$Title</span> [$Request[Year]]</a>";
} else {
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Title</a>";
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\" dir=\"ltr\">$Title</a>";
}
if (!empty($Tags[$RequestID])) {
@ -948,8 +951,6 @@ function require(file, callback) {
}
// --- Comments ---
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('artist', $ArtistID);
$Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');
?>

View File

@ -34,9 +34,9 @@
$ArtistLink = Artists::display_artists($ArtistForm, true, true);
if ($IsFilled) {
$DisplayLink = "$ArtistLink<a href=\"torrents.php?torrentid=$Request[TorrentID]\">$Request[Title]</a> [$Request[Year]]";
$DisplayLink = "$ArtistLink<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Request[Title]</a> [$Request[Year]]";
} else {
$DisplayLink = $ArtistLink.$Request['Title']." [$Request[Year]]";
$DisplayLink = $ArtistLink.'<span dir="ltr">'.$Request['Title']."</span> [$Request[Year]]";
}
$FullName = $ArtistName.$Request['Title']." [$Request[Year]]";
@ -58,9 +58,9 @@
} elseif ($CategoryName === 'Audiobooks' || $CategoryName === 'Comedy') {
$FullName = "$Request[Title] [$Request[Year]]";
$DisplayLink = "$Request[Title] [$Request[Year]]";
$DisplayLink = "<span dir=\"ltr\">$Request[Title]</span> [$Request[Year]]";
} else {
$FullName = $DisplayLink = $Request['Title'];
$FullName = $DisplayLink = "<span dir=\"ltr\">$Request[Title]</span>";
}
//Votes time
@ -70,6 +70,9 @@
$UserCanEdit = (!$IsFilled && $LoggedUser['ID'] === $Request['UserID'] && $VoteCount < 2);
$CanEdit = ($UserCanEdit || $ProjectCanEdit || check_perms('site_moderate_requests'));
// Comments (must be loaded before View::show_header so that subscriptions and quote notifications are handled properly)
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('requests', $RequestID);
View::show_header("View request: $FullName", 'comments,requests,bbcode,subscriptions');
?>
@ -438,9 +441,6 @@
<?= Text::full_format($Request['Description']);?>
</div>
</div>
<?
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('requests', $RequestID);
?>
<div id="request_comments">
<div class="linkbox">
<a name="comments"></a>

View File

@ -583,11 +583,11 @@
if ($CategoryName === 'Music') {
$ArtistForm = Requests::get_artists($RequestID);
$ArtistLink = Artists::display_artists($ArtistForm, true, true);
$FullName = "$ArtistLink<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title] [$Request[Year]]</a>";
$FullName = "$ArtistLink<a href=\"requests.php?action=view&amp;id=$RequestID\"><span dir=\"ltr\">$Request[Title]</span> [$Request[Year]]</a>";
} elseif ($CategoryName === 'Audiobooks' || $CategoryName === 'Comedy') {
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title] [$Request[Year]]</a>";
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\"><span dir=\"ltr\">$Request[Title]</span> [$Request[Year]]</a>";
} else {
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title]</a>";
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\" dir=\"ltr\">$Request[Title]</a>";
}
$Tags = $Request['Tags'];
?>

View File

@ -90,6 +90,8 @@ function compare($X, $Y) {
}
}
// Comments (must be loaded before View::show_header so that subscriptions and quote notifications are handled properly)
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('torrents', $GroupID);
// Start output
View::show_header($Title, 'browse,comments,torrent,bbcode,recommend,cover_art,subscriptions');
@ -904,8 +906,6 @@ function filelist($Str) {
</div>
<?
// --- Comments ---
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('torrents', $GroupID);
$Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');
?>
<div id="torrent_comments">