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

Merge branch 'feature/b2060-migrate-silex-to-symfony' into develop

Browse Source 
# Conflicts:
#	core/dbsearch.class.php
#	datamodels/2.x/itop-portal-base/module.itop-portal-base.php
#	datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
#	datamodels/2.x/itop-portal/module.itop-portal.php
This commit is contained in:
Molkobain
2019-07-12 09:57:16 +02:00
parent a11e783867 8ca2fffa78
commit 38640b01a8
2555 changed files with 13152 additions and 223921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/utils.inc.php
View File

@@ -1053,6 +1053,15 @@ class utils
{
return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
}
/**
* Returns a path to a folder into which any module can store log
* @return string
* @since 2.7.0
*/
public static function GetLogPath()
{
return APPROOT.'log/';
}
/**
* Merge standard menu items with plugin provided menus items
*/