From bd7a11f0b150f5ba9af3d181b312704dccd0107c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 15 Jul 2015 16:57:26 +0200 Subject: [PATCH] use configured classname in getInstance() this will make sure that even getInstance in child classes defined by an extension will return objects of the right class --- SeedDMS_Core/Core/inc.ClassDocument.php | 3 ++- SeedDMS_Core/Core/inc.ClassFolder.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 58e016aa9..bd8d60015 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -239,7 +239,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $lock = $lockArr[0]["userID"]; } - $document = new self($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $lock, $resArr["keywords"], $resArr["sequence"]); + $classname = $dms->getClassname('document'); + $document = new $classname($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $lock, $resArr["keywords"], $resArr["sequence"]); $document->setDMS($dms); return $document; } /* }}} */ diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 7fb9b28f1..982ca1652 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -131,7 +131,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { return false; $resArr = $resArr[0]; - $folder = new self($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]); + $classname = $dms->getClassname('folder'); + $folder = new $classname($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]); $folder->setDMS($dms); return $folder; } /* }}} */