Merged in release/3.3 (pull request #6558)

Updating branch release/3.3.1 with the last fixes on release/3.3

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>

workflow/engine/classes/WsBase.php

@@ -931,7 +931,7 @@ class WsBase
                 $cc,
                 $bcc,
                 '',
-                '',
+                $attachment,
                 'pending',
                 ($showMessage) ? 1 : 0,
                 $msgError,

workflow/engine/src/ProcessMaker/Util/FixReferencePath.php

@@ -125,7 +125,6 @@ class FixReferencePath
                     $pmTable->prepare();
                     $pmTable->preparePropelIniFile();
                     $pmTable->buildSchema();
-                    $pmTable->phingbuildModel();
                     $this->outVerboseln("* Regenerate classes for table: " . $row["ADD_TAB_NAME"]);
                 } catch (Exception $e) {
                     CLI::logging(CLI::error("Error:" . "Error in regenerate classes for table: " . $row["ADD_TAB_NAME"] . ". " . $e));

workflow/engine/templates/admin/pmLogo.js

@@ -245,6 +245,9 @@ Ext.onReady(function () {
                     buttonText: _('ID_SELECT_FILE'),
                     name: 'img',
                     validator: function (filePath) {
+                        if (uploadWin.isVisible() === false) {
+                            return true;
+                        }
                         var flag, btn;
                         btn = Ext.getCmp('btnUpload');
                         btn.disable();
@@ -295,9 +298,9 @@ Ext.onReady(function () {
 
                                     PMExt.notify(_('ID_SUCCESS'), messageError);
                                 }
+                                uploadWin.hide();
                                 panelRightTop.getForm().reset();
                                 store.load();
-                                uploadWin.hide();
                             }
                         });
                     }