diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-05-01 18:50:31 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-05-01 18:50:31 +0200 |
| commit | 70cea18cce0fcdb4d8118ff2d7abccc922417a6a (patch) | |
| tree | 7f8c476cb75b38fea3ed4ad555f00885f6da2670 /apps/media | |
| parent | dc7cdda5ccc7d40bf9865e1af5a7846782ec700b (diff) | |
| download | nextcloud-server-70cea18cce0fcdb4d8118ff2d7abccc922417a6a.tar.gz nextcloud-server-70cea18cce0fcdb4d8118ff2d7abccc922417a6a.zip | |
ported getUser
Diffstat (limited to 'apps/media')
| -rwxr-xr-x[-rw-r--r--] | apps/media/ajax/api.php | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | apps/media/ajax/autoupdate.php | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | apps/media/lib_collection.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index 9c7b3efce75..3238ebcc679 100644..100755 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -48,16 +48,16 @@ if(!isset($arguments['album'])){ if(!isset($arguments['search'])){ $arguments['search']=''; } -OC_MEDIA_COLLECTION::$uid=OC_User::getUser(); +OC_MEDIA_COLLECTION::$uid=OCP\USER::getUser(); if($arguments['action']){ switch($arguments['action']){ case 'delete': $path=$arguments['path']; OC_MEDIA_COLLECTION::deleteSongByPath($path); - $paths=explode(PATH_SEPARATOR,OC_Preferences::getValue(OC_User::getUser(),'media','paths','')); + $paths=explode(PATH_SEPARATOR,OC_Preferences::getValue(OCP\USER::getUser(),'media','paths','')); if(array_search($path,$paths)!==false){ unset($paths[array_search($path,$paths)]); - OC_Preferences::setValue(OC_User::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths)); + OC_Preferences::setValue(OCP\USER::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths)); } case 'get_collection': $data=array(); diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php index ea7c5006e70..24a7e2463f0 100644..100755 --- a/apps/media/ajax/autoupdate.php +++ b/apps/media/ajax/autoupdate.php @@ -32,7 +32,7 @@ OC_JSON::checkAppEnabled('media'); $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true'); -OC_Preferences::setValue(OC_User::getUser(),'media','autoupdate',(integer)$autoUpdate); +OC_Preferences::setValue(OCP\USER::getUser(),'media','autoupdate',(integer)$autoUpdate); OC_JSON::success(array('data' => $autoUpdate)); ?> diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php index 411acd97506..128fcde28d1 100644..100755 --- a/apps/media/lib_collection.php +++ b/apps/media/lib_collection.php @@ -261,7 +261,7 @@ class OC_MEDIA_COLLECTION{ if($name=='' or $path==''){ return 0; } - $uid=OC_User::getUser(); + $uid=OCP\USER::getUser(); //check if the song is already in the database $songId=self::getSongId($name,$artist,$album); if($songId!=0){ |