fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in norah/processmaker/BUG15479 (pull request #755)

Browse Source 
BUG-15479 CORRECCION
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-05 10:08:50 -04:00
parent 57de51bf4f de5553a21b
commit 99786faf4d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -56,7 +56,6 @@ CLI::taskDescription(<<<EOT
EOT
);
CLI::taskArg('workspace');
Add a comment to this line
CLI::taskRun("run_unify_database");
/**

12
workflow/engine/controllers/installer.php
View File

@@ -703,13 +703,13 @@ class Installer extends Controller
$dbText .= sprintf( " define ('DB_USER', '%s' );\n", $wf );
$dbText .= sprintf( " define ('DB_PASS', '%s' );\n", $wfPass );
$dbText .= sprintf( " define ('DB_RBAC_HOST', '%s' );\n", $db_host );
$dbText .= sprintf( " define ('DB_RBAC_NAME', '%s' );\n", $rb_workpace );
$dbText .= sprintf( " define ('DB_RBAC_USER', '%s' );\n", $rb );
$dbText .= sprintf( " define ('DB_RBAC_PASS', '%s' );\n", $rbPass );
$dbText .= sprintf( " define ('DB_RBAC_NAME', '%s' );\n", $wf_workpace );
$dbText .= sprintf( " define ('DB_RBAC_USER', '%s' );\n", $wf );
$dbText .= sprintf( " define ('DB_RBAC_PASS', '%s' );\n", $wfPass );
$dbText .= sprintf( " define ('DB_REPORT_HOST', '%s' );\n", $db_host );
$dbText .= sprintf( " define ('DB_REPORT_NAME', '%s' );\n", $rp_workpace );
$dbText .= sprintf( " define ('DB_REPORT_USER', '%s' );\n", $rp );
$dbText .= sprintf( " define ('DB_REPORT_PASS', '%s' );\n", $rpPass );
$dbText .= sprintf( " define ('DB_REPORT_NAME', '%s' );\n", $wf_workpace );
$dbText .= sprintf( " define ('DB_REPORT_USER', '%s' );\n", $wf );
$dbText .= sprintf( " define ('DB_REPORT_PASS', '%s' );\n", $wfPass );
if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
$dbText .= "\n";
$dbText .= " define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n";