Commit 4e0d786ae819a5672542c8a009b2dfd3e67de1b1

Authored by Neil Blakey-Milner
1 parent 588f9bf5

Error out if the user or parent folder objects are error objects.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6021 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/foldermanagement/folderutil.inc.php
@@ -41,6 +41,12 @@ require_once(KT_LIB_DIR . '/database/dbutil.inc'); @@ -41,6 +41,12 @@ require_once(KT_LIB_DIR . '/database/dbutil.inc');
41 41
42 class KTFolderUtil { 42 class KTFolderUtil {
43 function _add ($oParentFolder, $sFolderName, $oUser) { 43 function _add ($oParentFolder, $sFolderName, $oUser) {
  44 + if (PEAR::isError($oParentFolder)) {
  45 + return $oParentFolder;
  46 + }
  47 + if (PEAR::isError($oUser)) {
  48 + return $oUser;
  49 + }
44 $oStorage =& KTStorageManagerUtil::getSingleton(); 50 $oStorage =& KTStorageManagerUtil::getSingleton();
45 $oFolder =& Folder::createFromArray(array( 51 $oFolder =& Folder::createFromArray(array(
46 'name' => $sFolderName, 52 'name' => $sFolderName,