Merge branch 'support/2.5' into release/2.6

This commit is contained in:
Pierre Goiffon
2018-11-09 17:39:17 +01:00
2 changed files with 4 additions and 2 deletions

View File

@@ -2522,7 +2522,9 @@ EOF
}
} catch (FileUploadException $e)
{
// fail silently ??
$sCurrentUserLogin = UserRights::GetUser();
$sErrorMessage = "CKE : error when uploading image in ajax.render.php - operation=cke_upload_and_browse,User='$sCurrentUserLogin', class='$sObjClass',exception=$e";
IssueLog::Error($sErrorMessage);
}
// Fall though !! => browse