composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.5' into release/2.6

Browse Source
This commit is contained in:
Pierre Goiffon
2018-11-09 17:39:17 +01:00
parent 29df8f8f92 6f79c16ba0
commit 43bfe06882
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -62,4 +62,4 @@ pipeline {
options {
timeout(time: 20, unit: 'MINUTES')
}
}
}

4
pages/ajax.render.php
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