wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brion Vibber 2011-03-10 16:16:06 -08:00
commit 2858f495fa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/newapplication.php
View File

@ -22,7 +22,7 @@
* @category Applications * @category Applications
* @package StatusNet * @package StatusNet
* @author Zach Copley <zach@status.net> * @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 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
@ -290,7 +290,13 @@ class NewApplicationAction extends OwnerDesignAction
$app->query('ROLLBACK'); $app->query('ROLLBACK');
} }
$app->uploadLogo(); try {
$app->uploadLogo();
} catch (Exception $e) {
$app->query('ROLLBACK');
$this->showForm(_('Invalid image.'));
return;
}
$app->query('COMMIT'); $app->query('COMMIT');