From: kondou <kondou@ts.unde.re>
Date: Wed, 12 Mar 2014 14:29:26 +0000 (+0100)
Subject: Merge branch 'master' into hide_remove_image_avatar
X-Git-Tag: v7.0.0alpha2~630^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1c82b4751ecb69ed1f0973b3cde0a255daaf9747;p=nextcloud-server.git

Merge branch 'master' into hide_remove_image_avatar
---

1c82b4751ecb69ed1f0973b3cde0a255daaf9747
diff --cc settings/js/personal.js
index f38ec4e9ab1,7a4257f1c97..26c50f8fa5d
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@@ -255,10 -253,9 +255,10 @@@ $(document).ready(function()
  	$('#removeavatar').click(function(){
  		$.ajax({
  			type:	'DELETE',
- 			url:	OC.Router.generate('core_avatar_delete'),
+ 			url:	OC.generateUrl('/avatar/'),
  			success: function(msg) {
  				updateAvatar(true);
 +				$('#removeavatar').addClass('hidden');
  			}
  		});
  	});