I solved the conflicts

2015-03-31 15:42:44 -04:00
parent e270844edf
commit 0872b7208e
1 changed files with 2 additions and 2 deletions
--- a/workflow/engine/classes/model/AddonsManager.php
+++ b/workflow/engine/classes/model/AddonsManager.php
@@ -215,8 +215,8 @@ class AddonsManager extends BaseAddonsManager
        $var = explode("&", $aux[1]);

        ///////
-        $boundary = "---------------------" . substr(md5(rand(0, 32000)), 0, 10);
-        $data = "";
+        $boundary = "---------------------" . substr(G::encryptOld(rand(0, 32000)), 0, 10);
+        $data = null;

        for ($i = 0; $i <= count($var) - 1; $i++) {
            $aux = explode("=", $var[$i]);