From 44f8f633bfa086e54c979b2723e509f8c9690f8b Mon Sep 17 00:00:00 2001
From: Veronica Aruquipa <varuquipa789@gmail.com>
Date: Fri, 5 Dec 2014 14:20:49 -0400
Subject: [PATCH 1/2] Merged fixing-broken-features into master


From 91de514063574a582465c80308faecdb0294767d Mon Sep 17 00:00:00 2001
From: Freddy Daniel Rojas Valda <daniel.rojas@colosa.com>
Date: Fri, 5 Dec 2014 16:59:40 -0400
Subject: [PATCH 2/2] PM-1040. Remove code from the Community version. Fix EOT
 space

---
 workflow/engine/bin/tasks/cliUpgrade.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php
index e0f9046f8..5d6bd71bf 100755
--- a/workflow/engine/bin/tasks/cliUpgrade.php
+++ b/workflow/engine/bin/tasks/cliUpgrade.php
@@ -31,13 +31,8 @@ G::LoadSystem("dbMaintenance");
 G::LoadClass("cli");
 
 CLI::taskName('upgrade');
-CLI::taskDescription(<<<EOT
-    Upgrade workspaces.
+CLI::taskDescription("Upgrade workspaces.\n\n This command should be run after ProcessMaker files are upgraded so that all workspaces are upgraded to the current version.");
 
-    This command should be run after ProcessMaker files are upgraded so that all
-    workspaces are upgraded to the current version.
-EOT
-);
 CLI::taskOpt("buildACV", "If the option is enabled, performs the Build Cache View.", "ACV", "buildACV");
 CLI::taskRun("run_upgrade");
 /*----------------------------------********---------------------------------*/