GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into profile-fixups

Browse Source
This commit is contained in:
Zach Copley 2011-03-10 15:18:41 -08:00
commit 3592397d77
2 changed files with 9 additions and 3 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');

2
theme/neo/css/display.css
View File

@ -322,7 +322,7 @@ address {
} }
.form_notice .error, .form_notice .error,
.form_notice .success. .form_notice .success,
.form_notice .notice-status { .form_notice .notice-status {
width: 478px; width: 478px;
position: relative; position: relative;