diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /mod/profile_photo.php | |
parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'mod/profile_photo.php')
-rw-r--r--[-rwxr-xr-x] | mod/profile_photo.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php index d1fd08eba..ace8dadd4 100755..100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -151,7 +151,7 @@ function profile_photo_content(&$a) { return; }; - check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); +// check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); $resource_id = $a->argv[2]; //die(":".local_user()); |