X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewapplication.php;h=23525ef32194471f20a6bc3c5ca6d94048cd3871;hb=f79aec36feaa4760201a7e88d5b31513a3c458ba;hp=eb13593536f67a0b18fe04f19243c0e79a5c6856;hpb=b7d07466943a73e1c009467c8daa6e499810080f;p=quix0rs-gnu-social.git

diff --git a/actions/newapplication.php b/actions/newapplication.php
index eb13593536..23525ef321 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -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/
  */
@@ -42,7 +42,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class NewApplicationAction extends OwnerDesignAction
+class NewApplicationAction extends Action
 {
     var $msg;
 
@@ -109,6 +109,7 @@ class NewApplicationAction extends OwnerDesignAction
         // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token.'));
             return;
         }
@@ -290,7 +291,14 @@ class NewApplicationAction extends OwnerDesignAction
             $app->query('ROLLBACK');
         }
 
-        $app->uploadLogo();
+	try {
+            $app->uploadLogo();
+        } catch (Exception $e) {
+            $app->query('ROLLBACK');
+            // TRANS: Form validation error messages displayed when uploading an invalid application logo.
+            $this->showForm(_('Invalid image.'));
+	        return;	 
+	}
 
         $app->query('COMMIT');