yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 02:09:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop

Browse source 
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
This commit is contained in:
Afterster 2015-11-07 08:08:59 +01:00
commit 5124a5ed4c
303 changed files with 4334 additions and 4561 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/plugins/RSSView/RSSView.plugin.php
View file

@ -91,7 +91,7 @@ class AmpacheRSSView
public function display_home()
{
$xmlstr = file_get_contents($this->feed_url);
$xml = simplexml_load_string($xmlstr);
$xml = simplexml_load_string($xmlstr);
if ($xml->channel) {
UI::show_box_top($xml->channel->title);
$i = 0;
@ -106,7 +106,7 @@ class AmpacheRSSView
if (isset($item->image)) {
echo '<div style="float: left; margin-right: 20px;"><img src="' . $item->image . '" style="width: auto; max-height: 48px;" /></div>';
}
echo '<div>'. $item->description .'</div>';
echo '<div>' . $item->description . '</div>';
echo '</div>';
echo '</td></tr>';