Merge branch 'master' of github.com:easysoft/zentaopms

Conflicts: module/dev/lang/en.php
2015-03-05 09:20:44 +08:00
parent 22f0a7fb22 fdc283afd7
commit ab274a4ff8
56 changed files with 1320 additions and 95 deletions
@@ -1100,6 +1100,7 @@ class task extends control
                /* Set related files. */
                if(isset($relatedFiles[$task->id]))
                {
+                    $task->files = '';
                    foreach($relatedFiles[$task->id] as $file)
                    {
                        $fileURL = 'http://' . $this->server->http_host . $this->config->webRoot . "data/upload/{$this->app->company->id}/" . $file->pathname;