Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Browse Source 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur
2017-03-10 13:42:55 +01:00
parent 3f69b1fdf5 427f656bac
commit e6f294d18d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/files.lib.php
View File

@@ -1968,7 +1968,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
} }
/** /**
* Store object in file * Store object in file.
* *
* @param string $directory Directory of cache * @param string $directory Directory of cache
* @param string $filename Name of filecache * @param string $filename Name of filecache
@@ -1984,7 +1984,7 @@ function dol_filecache($directory, $filename, $object)
} }
/** /**
* Test if Refresh needed * Test if Refresh needed.
* *
* @param string $directory Directory of cache * @param string $directory Directory of cache
* @param string $filename Name of filecache * @param string $filename Name of filecache
@@ -2000,7 +2000,7 @@ function dol_cache_refresh($directory, $filename, $cachetime)
} }
/** /**
* Read object from cachefile * Read object from cachefile.
* *
* @param string $directory Directory of cache * @param string $directory Directory of cache
* @param string $filename Name of filecache * @param string $filename Name of filecache