Don't run JSCombiner when not installed

When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index a7bbf129e01..9f92813f905 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -45,11 +45,10 @@ class JSCombiner {
 	protected $config;
 
 	/**
-	 * JSCombiner constructor.
-	 *
 	 * @param IAppData $appData
 	 * @param IURLGenerator $urlGenerator
 	 * @param ICache $depsCache
+	 * @param SystemConfig $config
 	 */
 	public function __construct(IAppData $appData,
 								IURLGenerator $urlGenerator,
@@ -68,7 +67,7 @@ class JSCombiner {
 	 * @return bool
 	 */
 	public function process($root, $file, $app) {
-		if ($this->config->getValue('debug')) {
+		if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
 			return false;
 		}
 
@@ -183,7 +182,11 @@ class JSCombiner {
 	 * @return string[]
 	 */
 	public function getContent($root, $file) {
+		/** @var array $data */
 		$data = json_decode(file_get_contents($root . '/' . $file));
+		if(!is_array($data)) {
+			return [];
+		}
 
 		$path = explode('/', $file);
 		array_pop($path);