Merge branch 'master' into do-not-need-last-inserted-id

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index 33880792..cbe5a1f1 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -148,9 +148,6 @@ class NavigationController extends Controller {
 			]
 		];
 
-		$checks = $this->checkService->checkDefault();
-		$data['serverData']['checks'] = $checks;
-
 		try {
 			$data['serverData']['cloudAddress'] = $this->configService->getCloudAddress();
 		} catch (SocialAppConfigException $e) {
@@ -171,6 +168,11 @@ class NavigationController extends Controller {
 			}
 		}
 
+		if ($data['serverData']['isAdmin']) {
+			$checks = $this->checkService->checkDefault();
+			$data['serverData']['checks'] = $checks;
+		}
+
 		/*
 		 * Create social user account if it doesn't exist yet
 		 */
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index f87b0b4b..73072a7e 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -235,7 +235,7 @@ class ImportService {
 			$service->parse($activity);
 		} catch (Exception $e) {
 			$this->miscService->log(
-				2, 'Cannot parse ' . $activity->getType() . ': ' . $e->getMessage()
+				'Cannot parse ' . $activity->getType() . ': ' . $e->getMessage()
 			);
 		}
 	}