lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix infinite loop

Browse Source
This commit is contained in:
atm-greg 2018-08-14 09:32:43 +02:00
parent 3d84adbd76
commit ba6f7d4b0a
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/projet/class/project.class.php
View File

@ -633,7 +633,8 @@ class Project extends CommonObject
$this->getLinesArray($user); $this->getLinesArray($user);
// Delete tasks // Delete tasks
$this->deleteTasks($this->lines); $ret = $this->deleteTasks($user);
if ($ret < 0) $error++;
// Delete project // Delete project
if (! $error) if (! $error)
@ -715,16 +716,31 @@ class Project extends CommonObject
* *
* @param array $arr Array of tasks * @param array $arr Array of tasks
*/ */
function deleteTasks($arr) function deleteTasks($user)
{ {
global $user; $countTasks = count($this->lines);
$deleted = false;
foreach($arr as $task) if ($countTasks){
{ foreach($this->lines as $task)
if($task->hasChildren() <= 0) $task->delete($user); {
if($task->hasChildren() <= 0) {
$deleted = true;
$ret = $task->delete($user);
if ($ret < 1)
{
$this->errors[] = $this->db->lasterror();
return -1;
}
}
}
} }
$this->getLinesArray($user); $this->getLinesArray($user);
if (count($this->lines)) $this->deleteTasks($this->lines); if($deleted && count($this->lines) < $countTasks)
{
if (count($this->lines)) $this->deleteTasks($this->lines);
}
return 1;
} }
/** /**