composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-27 20:48:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	core/expressioncache.class.inc.php
This commit is contained in:
Pierre Goiffon
2019-02-21 17:24:37 +01:00
parent a35690d13c 1f7923beae
commit e59e62fb1b
17 changed files with 193 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/archivetar/tar.php
View File

@@ -1218,7 +1218,7 @@ class ArchiveTar
$iBufferLen = strlen("$v_buffer");
if ($iBufferLen != $iLen)
{
$iPack = ((int)($iBufferLen / 512) + 1) * 512;
$iPack = (ceil($iBufferLen / 512)) * 512;
$sPack = sprintf('a%d', $iPack);
}
else