KickstartForm: prepare for utf8mb4

application/forms/KickstartForm.php

@@ -169,7 +169,7 @@ class KickstartForm extends QuickForm
         if ($resourceName = $this->getResourceName()) {
             $resourceConfig = ResourceFactory::getResourceConfig($resourceName);
             if (! isset($resourceConfig->charset)
-                || $resourceConfig->charset !== 'utf8'
+                || ! in_array($resourceConfig->charset, array('utf8', 'utf8mb4'))
             ) {
                 $this->getElement('resource')
                     ->addError('Please change the encoding for the director database to utf8');
@@ -340,7 +340,7 @@ class KickstartForm extends QuickForm
             $kickstart->setConfig($values)->run();
             parent::onSuccess();
         } catch (Exception $e) {
-            $this->addError($e->getMessage());
+            $this->addException($e);
         }
     }