letting the exception continue bubbling up.
* @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/
*/
$app->query('ROLLBACK');
}
- $app->uploadLogo();
+ try {
+ $app->uploadLogo();
+ } catch (Exception $e) {
+ $app->query('ROLLBACK');
+ $this->showForm(_('Invalid image.'));
+ return;
+ }
$app->query('COMMIT');