gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-08 20:46:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sіmplify and possibly fix method isDescendant()

Browse Source
This commit is contained in:
Uwe Steinmann 2019-07-01 13:06:08 +02:00
parent 536067200e
commit d18a3389bc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -692,15 +692,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
* @return boolean true if folder is a subfolder * @return boolean true if folder is a subfolder
*/ */
function isDescendant($folder) { /* {{{ */ function isDescendant($folder) { /* {{{ */
if ($this->_parentID == $folder->getID()) if(!$this->getParent())
return true;
elseif (isset($this->_parentID)) {
$res = $this->getParent();
if (!$res) return false;
return $this->_parent->isDescendant($folder);
} else
return false; return false;
if($this->getParent()->getID() == $folder->getID())
return true;
return $this->getParent()->isDescendant($folder);
} /* }}} */ } /* }}} */
/** /**