Merge branch '1.0.x' into profile-fixups
This commit is contained in:
commit
3592397d77
@ -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');
|
||||
|
||||
|
@ -322,7 +322,7 @@ address {
|
||||
}
|
||||
|
||||
.form_notice .error,
|
||||
.form_notice .success.
|
||||
.form_notice .success,
|
||||
.form_notice .notice-status {
|
||||
width: 478px;
|
||||
position: relative;
|
||||
|
Loading…
Reference in New Issue
Block a user