mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-12 20:51:30 +00:00
don't crash if folder/document was deleted (Bug #186)
This commit is contained in:
parent
0d4f9ad49a
commit
b39b92e0b0
|
@ -43,6 +43,7 @@ if ($targetFolder->getAccessMode($user) < M_READWRITE) {
|
||||||
$clipboard = $session->getClipboard();
|
$clipboard = $session->getClipboard();
|
||||||
foreach($clipboard['docs'] as $documentid) {
|
foreach($clipboard['docs'] as $documentid) {
|
||||||
$document = $dms->getDocument($documentid);
|
$document = $dms->getDocument($documentid);
|
||||||
|
if($document) {
|
||||||
$oldFolder = $document->getFolder();
|
$oldFolder = $document->getFolder();
|
||||||
|
|
||||||
if ($document->getAccessMode($user) < M_READWRITE) {
|
if ($document->getAccessMode($user) < M_READWRITE) {
|
||||||
|
@ -80,11 +81,12 @@ foreach($clipboard['docs'] as $documentid) {
|
||||||
} else {
|
} else {
|
||||||
$session->removeFromClipboard($document);
|
$session->removeFromClipboard($document);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($clipboard['folders'] as $folderid) {
|
foreach($clipboard['folders'] as $folderid) {
|
||||||
$folder = $dms->getFolder($folderid);
|
$folder = $dms->getFolder($folderid);
|
||||||
|
if($folder) {
|
||||||
if ($folder->getAccessMode($user) < M_READWRITE) {
|
if ($folder->getAccessMode($user) < M_READWRITE) {
|
||||||
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
|
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
|
||||||
}
|
}
|
||||||
|
@ -117,6 +119,7 @@ foreach($clipboard['folders'] as $folderid) {
|
||||||
} else {
|
} else {
|
||||||
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
|
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_moved_clipboard')));
|
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_moved_clipboard')));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user