We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 2858f495 authored by Brion Vibber's avatar Brion Vibber

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

parents d107164a a984aae5
......@@ -22,7 +22,7 @@
* @category Applications
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2008-2009 StatusNet, Inc.
* @copyright 2008-2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
......@@ -290,7 +290,13 @@ class NewApplicationAction extends OwnerDesignAction
$app->query('ROLLBACK');
}
$app->uploadLogo();
try {
$app->uploadLogo();
} catch (Exception $e) {
$app->query('ROLLBACK');
$this->showForm(_('Invalid image.'));
return;
}
$app->query('COMMIT');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment