sync from 3.5 branch for #493

1 files changed, 8 insertions, 20 deletions

diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index 01868d85..0e9c2445 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -45,31 +45,19 @@ $client->format();
 			$tmp_playlist = new tmpPlaylist(tmpPlaylist::get_from_userid($client->id)); 
 			$object_ids = $tmp_playlist->get_items(); 
 			foreach ($object_ids as $object_data) { 
-				if ($object_data['1'] == 'radio' || $object_data['1'] == 'song') { 
-					$object = new $object_data['1']($object_data['0']);
-					$object->format(); 
-				} 
-				else { 
-					$object = new Random(); 
-					$object->f_link = Random::get_type_name($object_data['1']); 
-				} 
+				$type = array_shift($object_data); 
+				$object = new $type(array_shift($object_data)); 
+				$object->format(); 
 		?>
 		<?php echo $object->f_link; ?><br />
 		<?php } ?>
 		</div>
 	</td>
 </tr>
-<tr>
-	<td valign="top">
-		&nbsp;
-	</td>
-	<td>
-	<?php 
-		echo "<h2>" . _('Recently Played') . "</h2>\n"; 
-		$data = Song::get_recently_played($client->id); 
-		require Config::get('prefix') . '/templates/show_recently_played.inc.php'; 
-	?>
-	</td>
-</tr>
 </table>
 <?php show_box_bottom(); ?>
+<?php 
+	$data = Song::get_recently_played($client->id); 
+	require Config::get('prefix') . '/templates/show_recently_played.inc.php'; 
+?>
+