diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-01 17:13:11 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-25 21:04:09 +0200 |
| commit | a58d270684110334aab1b296b69e98def6cc6558 (patch) | |
| tree | 8912f763df59d9c2e75a608e039af19701696df5 /settings | |
| parent | 2bfe66223563b16a067be273e0d6979b420598ad (diff) | |
| download | nextcloud-server-a58d270684110334aab1b296b69e98def6cc6558.tar.gz nextcloud-server-a58d270684110334aab1b296b69e98def6cc6558.zip | |
Load avatar from path, if one's provided
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/newavatar.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/settings/ajax/newavatar.php b/settings/ajax/newavatar.php index 456cd84e970..4c8ff0c4169 100644 --- a/settings/ajax/newavatar.php +++ b/settings/ajax/newavatar.php @@ -5,16 +5,12 @@ OC_JSON::callCheck(); $user = OC_User::getUser(); if(isset($_POST['path'])) { - $path = $_POST['path']; - if ($path === "false") { // delete avatar + if ($_POST['path'] === "false") { // delete avatar \OC_Avatar::setLocalAvatar($user, false); } else { // select an image from own files - $view = new \OC\Files\View('/'.$user.'/files'); - $img = $view->file_get_contents($path); - - $type = substr($path, -3); try { - \OC_Avatar::setLocalAvatar($user, $img); + $path = OC::$SERVERROOT.'/data/'.$user.'/files'.$_POST['path']; + \OC_Avatar::setLocalAvatar($user, $path); OC_JSON::success(); } catch (Exception $e) { OC_JSON::error(); |