Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fix in move()

Browse source
This commit is contained in:
Aleksander Machniak 2024-01-05 13:57:53 +01:00
parent 737f4c119e
commit a2884d0417
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/libkolab/lib/kolab_storage_folder.php
View file

@ -870,9 +870,10 @@ class kolab_storage_folder extends kolab_storage_folder_api
/**
* Move a Kolab object message to another IMAP folder
*
* @param string Object UID
* @param string IMAP folder to move object to
* @return boolean True on success, false on failure
* @param string Object UID
* @param string|kolab_storage_folder IMAP folder to move object to
*
* @return bool True on success, false on failure
*/
public function move($uid, $target_folder)
{
@ -880,8 +881,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
return false;
}
if (is_string($target_folder))
if (is_string($target_folder)) {
$target_folder = kolab_storage::get_folder($target_folder);
}
if ($msguid = $this->cache->uid2msguid($uid)) {
$this->cache->imap_mode(true);
@ -897,7 +899,7 @@ class kolab_storage_folder extends kolab_storage_folder_api
rcube::raise_error(array(
'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),
'message' => "Failed to move message $msguid to {$target_folder->name}: " . $this->imap->get_error_str(),
), true);
}
}