diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
| commit | 4753cc3ebde9867ab4deb1979fb4231b0c847426 (patch) | |
| tree | c6944e947bc84c8716b57b7e2b06ef51efccb3db /apps/contacts/ajax/uploadphoto.php | |
| parent | 6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 (diff) | |
| parent | f3b30e4658c4dde82b56b458c672fa5edcba5d6b (diff) | |
| download | nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.tar.gz nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.zip | |
Merge branch 'master' into multi_app_dir
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
Diffstat (limited to 'apps/contacts/ajax/uploadphoto.php')
| -rw-r--r-- | apps/contacts/ajax/uploadphoto.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php index 09c4e55d4a9..889de6a1f8b 100644 --- a/apps/contacts/ajax/uploadphoto.php +++ b/apps/contacts/ajax/uploadphoto.php @@ -23,6 +23,8 @@ // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('contacts'); +OCP\JSON::callCheck(); + // Firefox and Konqueror tries to download application/json for me. --Arthur OCP\JSON::setContentTypeHeader('text/plain'); function bailOut($msg) { @@ -59,7 +61,7 @@ if ($fn) { bailOut(OC_Contacts_App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey); } } else { - bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey.$data); + bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey); } } |