mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Config helper (#10339)

Browse Source 
remove usage of global variable
This commit is contained in:
Tony Murray
2019-06-23 00:29:12 -05:00
committed by GitHub
parent 342acf50f1
commit f3ba8947f7
367 changed files with 1589 additions and 1857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LibreNMS/ObjectCache.php
View File

@@ -42,7 +42,6 @@ class ObjectCache implements ArrayAccess
*/
public function __construct($obj)
{
global $config;
$this->obj = $obj;
if (isset($GLOBALS['_ObjCache'][$obj])) {
$this->data = $GLOBALS['_ObjCacheSkell'][$obj];
@@ -55,9 +54,9 @@ class ObjectCache implements ArrayAccess
$GLOBALS['_ObjCache'] = array();
}
if (file_exists($config['install_dir'].'/includes/caches/'.$obj.'.inc.php')) {
if (file_exists(\LibreNMS\Config::get('install_dir') . '/includes/caches/' . $obj . '.inc.php')) {
$data = array();
include $config['install_dir'].'/includes/caches/'.$obj.'.inc.php';
include \LibreNMS\Config::get('install_dir') . '/includes/caches/' . $obj . '.inc.php';
$this->data = $data;
$GLOBALS['_ObjCacheSkell'][$obj] = $this->data;
if (!(isset($GLOBALS['_ObjCache'][$obj]) && is_array($GLOBALS['_ObjCache'][$obj]))) {