Commit d31aa064 authored by Mike Sheldon's avatar Mike Sheldon

Merge branch 'master' of gitorious.org:~Elleo/foocorp/elleos-gnu-fm

parents 9ca065c0 b6a6c0fe
......@@ -359,7 +359,7 @@ class Server {
static function getAlbumURL($artist, $album) {
global $friendly_urls, $base_url;
if ($friendly_urls) {
return $base_url . '/artist/' . rewrite_encode($artist) . '/album/' . urlencode($album);
return $base_url . '/artist/' . rewrite_encode($artist) . '/album/' . rewrite_encode($album);
} else {
return $base_url . '/album.php?artist=' . urlencode($artist) . '&album=' . urlencode($album);
}
......@@ -378,9 +378,9 @@ class Server {
static function getTrackURL($artist, $album, $track) {
global $friendly_urls, $base_url;
if ($friendly_urls && $album) {
return $base_url . '/artist/' . rewrite_encode($artist) . '/album/' . urlencode($album) . '/track/' . urlencode($track);
return $base_url . '/artist/' . rewrite_encode($artist) . '/album/' . rewrite_encode($album) . '/track/' . rewrite_encode($track);
} else if ($friendly_urls) {
return $base_url . '/artist/' . rewrite_encode($artist) . '/track/' . urlencode($track);
return $base_url . '/artist/' . rewrite_encode($artist) . '/track/' . rewrite_encode($track);
} else {
return $base_url . '/track.php?artist=' . urlencode($artist) . '&album=' . urlencode($album) . '&track=' . urlencode($track);
}
......@@ -389,9 +389,9 @@ class Server {
static function getTrackEditURL($artist, $album, $track) {
global $friendly_urls, $base_url;
if ($friendly_urls && $album) {
return $base_url . '/artist/' . rewrite_encode($artist) . '/album/' . urlencode($album) . '/track/' . rewrite_encode($track) . '/edit';
return $base_url . '/artist/' . rewrite_encode($artist) . '/album/' . rewrite_encode($album) . '/track/' . rewrite_encode($track) . '/edit';
} else if ($friendly_urls) {
return $base_url . '/artist/' . rewrite_encode($artist) . '/track/' . urlencode($track) . '/edit';
return $base_url . '/artist/' . rewrite_encode($artist) . '/track/' . rewrite_encode($track) . '/edit';
} else {
return $base_url . '/track-add.php?artist=' . urlencode($artist) . '&album=' . urlencode($album) . '&track=' . urlencode($track);
}
......
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