We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 2dbe45c1 authored by idflood's avatar idflood

hopefully should fix #26243 and not break working images.

parent a848362f
......@@ -154,7 +154,7 @@ $aws_xml = simplexml_load_file($request) or die("xml response not loading");
$image = $aws_xml->Items->Item->MediumImage->URL;
$URI = $aws_xml->Items->Item->DetailPageURL;
if ($image == "") { $image = "/i/qm50.png"; $license = "unknown-to-amazon";}
if ($image == "") { $image = $base_url . "/i/qm50.png"; $license = "unknown-to-amazon";}
if ($image) {
......
......@@ -114,7 +114,7 @@ class Server {
$row['id_album'] = identifierAlbum($row['username'], $row['artist'], $row['track'], $row['album'], $row['time'], $row['mbid'], $row['artist_mbid'], $row['album_mbid']);
if (! $row['album_image'])
$row['album_image'] = '/i/qm50.png';
$row['album_image'] = $base_url . '/i/qm50.png';
if ($row['artwork_license'] == "amazon")
$row['album_image'] = str_replace("SL160","SL50",$row['album_image']);
......@@ -186,7 +186,7 @@ class Server {
$row["trackurl"] = Server::getTrackURL($row['artist'], $row['album'], $row['track']);
// We really want to get an image URI from the database and only fall back to qm50.png if we can't find an image.
$row['albumart'] = '/i/qm50.png';
$row['albumart'] = $base_url . '/i/qm50.png';
$result[] = $row;
}
......
......@@ -15,7 +15,7 @@
<dl>
<dt>
<a rel="foaf:page" href="{$albums[i]->getURL()}">
<span{if $albums[i]->getAlbumArt() != '/i/qm50.png'} about="{$albums[i]->id}" rel="foaf:depiction"{/if}>
<span{if $albums[i]->getAlbumArt() != '{$base_url}/i/qm50.png'} about="{$albums[i]->id}" rel="foaf:depiction"{/if}>
<img class="album photo" src="{$albums[i]->getAlbumArt()}"
alt="{$albums[i]->name|escape:'html':'UTF-8'}"
title="{$albums[i]->name|escape:'html':'UTF-8'}" width="160" />
......
......@@ -61,7 +61,7 @@
<div about="{$scrobbles[i].id_album|escape:'html':'UTF-8'}" typeof="mo:Record"{if $scrobbles[i].album} property="dc:title" content="{$scrobbles[i].album|escape:'html':'UTF-8'}"{/if}>
{if $scrobbles[i].albumurl}<a rel="foaf:page" href="{$scrobbles[i].albumurl|escape:'html':'UTF-8'}">{/if}
<span{if $scrobbles[i].album_image != '/i/qm50.png'} rel="foaf:depiction"{/if}{if $scrobbles[i].albumurl} about="{$scrobbles[i].id_album|escape:'html':'UTF-8'}"{/if}>
<img height="50" width="50" src="{$scrobbles[i].album_image|escape:'html':'UTF-8'}" class="albumart{if $scrobbles[i].album_image != '/i/qm50.png'} photo{/if}" {if $scrobbles[i].album}title="{$scrobbles[i].album|escape:'html':'UTF-8'}" alt="Album: {$scrobbles[i].album|escape:'html':'UTF-8'}"{else}alt="Unknown album"{/if} />
<img height="50" width="50" src="{if $scrobbles[i].album_image != '/i/qm50.png'}{$scrobbles[i].album_image|escape:'html':'UTF-8'}{else}{$base_url}{$scrobbles[i].album_image|escape:'html':'UTF-8'}{/if}" class="albumart{if $scrobbles[i].album_image != '/i/qm50.png'} photo{/if}" {if $scrobbles[i].album}title="{$scrobbles[i].album|escape:'html':'UTF-8'}" alt="Album: {$scrobbles[i].album|escape:'html':'UTF-8'}"{else}alt="Unknown album"{/if} />
</span>
{if $scrobbles[i].albumurl}</a>{/if}
</div>
......
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