potential fix for #633

pufferpanel · Nov 30, 2015 · 13c4122 · 13c4122
1 parent 5703dfc
commit 13c4122
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/routes/admin/server/routes.php b/src/routes/admin/server/routes.php
@@ -876,15 +876,19 @@
 		return $response->code(500)->send();
 	}
 
-	$response->json(array(
-		'html' => $core->twig->render(
-			'admin/server/plugin-variables.html',
-			array(
-				'variables' => json_decode($orm->variables, true)
-			)
-		),
-		'startup' => $orm->default_startup
-	))->send();
-	return;
+	try {
+		return $response->json(array(
+			'html' => $core->twig->render(
+				'admin/server/plugin-variables.html',
+				array(
+					'variables' => json_decode($orm->variables, true)
+				)
+			),
+			'startup' => $orm->default_startup
+		))->send();
+	} catch (\Exception $e) {
+		Debugger::log($e);
+		return $response->code(500)->send();
+	}
 
 });