From 18dcbcbd72165e64608b8fad376630dce90e6f7e Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 3 Sep 2018 21:21:15 +0200 Subject: [PATCH] skip reading when firmware-product doesn't exist, avoids issues when running stand-alone for https://github.com/opnsense/ui_devtools/issues/3 --- .../mvc/app/controllers/OPNsense/Base/ControllerBase.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php index 3db266e40..f88145be5 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php @@ -187,9 +187,11 @@ class ControllerBase extends ControllerRoot $this->view->ui_theme = $cnf->object()->theme; } - $product_vars = json_decode(file_get_contents(__DIR__.'/../../../../../firmware-product'), true); - foreach ($product_vars as $product_key => $product_var) { - $this->view->$product_key = $product_var; + if (is_file(__DIR__.'/../../../../../firmware-product')) { + $product_vars = json_decode(file_get_contents(__DIR__.'/../../../../../firmware-product'), true); + foreach ($product_vars as $product_key => $product_var) { + $this->view->$product_key = $product_var; + } } // info about the current user and box