Commit 91502993 authored by Mike Sheldon's avatar Mike Sheldon

Merge commit 'refs/merge-requests/37' of git://gitorious.org/foocorp/gnu-fm into merge37

parents 7c271921 9a5e0365
......@@ -46,17 +46,6 @@ $smarty->assign('flattr_uid', $artist->flattr_uid);
$smarty->assign('url', $track->getURL());
$smarty->assign('pagetitle', $artist->name . ' : ' . $track->name);
$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
$res = $adodb->GetAll('SELECT * FROM Track WHERE lower(artist_name) = lower(' . $adodb->qstr($track->artist_name) . ') AND lower(name) = lower(' . $adodb->qstr($track->name) . ')');
$aOtherAlbums = array();
foreach ($res as &$trow) {
if ($trow['album']) {
$aOtherAlbums[] = new Album($trow['album'], $trow['artist']);
}
}
if (isset($this_user) && $this_user->manages($artist->name)) {
$smarty->assign('edit_link', $track->getEditURL());
}
......@@ -73,8 +62,6 @@ if ($track->duration) {
$smarty->assign('duration', $duration);
}
$smarty->assign('albums', $aOtherAlbums);
$smarty->assign('extra_head_links', array(
array(
'rel' => 'meta',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment