* sync product
This commit is contained in:
@@ -99,7 +99,8 @@ class treeModel extends model
|
||||
|
||||
/* $createdVersion < 4.1 or $type == 'story'. */
|
||||
return $this->dao->select('*')->from(TABLE_MODULE)
|
||||
->where('root')->eq((int)$rootID)
|
||||
->where('1=1')
|
||||
->beginIF($type != 'feedback' and !empty($rootID))->andwhere('root')->eq((int)$rootID)->fi()
|
||||
->andWhere('type')->eq($type)
|
||||
->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
|
||||
->beginIF($branch !== 'all' and $branch !== '' and $branch !== false)
|
||||
|
||||
@@ -7283,7 +7283,7 @@ class upgradeModel extends model
|
||||
|
||||
/*
|
||||
* Process feedback module
|
||||
*
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -7313,7 +7313,7 @@ class upgradeModel extends model
|
||||
if(isset($relation[$path])) $newPaths[] = $relation[$path];
|
||||
}
|
||||
$newPaths = join(',', $newPaths);
|
||||
$parent = !empty($module->parent) and isset($relation[$module->parent]) ? $relation[$module->parent] : 0;
|
||||
$parent = !empty($module->parent) ? $relation[$module->parent] : 0;
|
||||
$this->dao->update(TABLE_MODULE)->set('path')->eq($newPaths)->set('parent')->eq($parent)->where('id')->eq($newModuleID)->exec();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user