diff options
author | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
commit | ac609e804078cf70fcc02b36aa1eb40115354715 (patch) | |
tree | c206723a0fe28fd62f8d2838f589a42ec7523af5 /actions/avatarsettings.php | |
parent | 17c50f338ceb574780476f6b788f48e2d7d06017 (diff) | |
parent | 4a6c9e445149e42a4f81d5140296e7770c60bc6c (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
Diffstat (limited to 'actions/avatarsettings.php')
-rw-r--r-- | actions/avatarsettings.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 6a7398746..d4ea11cb7 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -301,6 +301,10 @@ class AvatarsettingsAction extends AccountSettingsAction $this->showForm($e->getMessage()); return; } + if ($imagefile === null) { + $this->showForm(_('No file uploaded.')); + return; + } $cur = common_current_user(); |