diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-27 18:10:40 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-30 10:07:19 -0400 |
| commit | 3e183b2eeab4ebd1e8df7531c22f1de6ec00cc97 (patch) | |
| tree | 72b0d990ec377af98e0d703e120538f2f11445b2 /apps/media | |
| parent | d07b8448d1e96f07c6e6b41293797a89a4530c3d (diff) | |
| download | nextcloud-server-3e183b2eeab4ebd1e8df7531c22f1de6ec00cc97.tar.gz nextcloud-server-3e183b2eeab4ebd1e8df7531c22f1de6ec00cc97.zip | |
Set filter to empty if not set by Ampache client
Conflicts:
apps/media/lib_ampache.php
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/lib_ampache.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php index 7c4e1dac3f6..63682100d4c 100644 --- a/apps/media/lib_ampache.php +++ b/apps/media/lib_ampache.php @@ -71,7 +71,6 @@ class OC_MEDIA_AMPACHE{ $pass=$users[0]['user_password_sha256']; $key=hash('sha256',$time.$pass); if($key==$auth){ - $token=hash('sha256','oc_media_'.$key); OC_MEDIA_COLLECTION::$uid=$users[0]['user_id']; $date=date('c');//todo proper update/add/clean dates @@ -268,7 +267,7 @@ class OC_MEDIA_AMPACHE{ return; } global $SITEROOT; - $filter=$params['filter']; + $filter = isset($params['filter']) ? $params['filter'] : ''; $albums=OC_MEDIA_COLLECTION::getAlbums($filter); $artist=OC_MEDIA_COLLECTION::getArtistName($filter); echo('<?xml version="1.0" encoding="UTF-8"?>'); @@ -397,7 +396,7 @@ class OC_MEDIA_AMPACHE{ </root>"); return; } - $filter=$params['filter']; + $filter = isset($params['filter']) ? $params['filter'] : ''; $artists=OC_MEDIA_COLLECTION::getArtists($filter); $albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter); $songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter); |