summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Controller/PageController.php10
-rw-r--r--templates/main.php2
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 87a0aeb6..49a445e8 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -88,16 +88,16 @@ class PageController extends Controller {
$locales = $this->languageFactory->findAvailableLocales();
$defaultProfile = $this->config->getAppValue(Application::APP_ID, 'defaultProfile', 'HOME');
+
$supportedNetworks = $this->socialApiService->getSupportedNetworks();
- $syncAllowedByAdmin = $this->config->getAppValue(Application::APP_ID, 'allowSocialSync', 'yes'); // allow users to retrieve avatars from social networks (default: yes)
- $bgSyncEnabledByUser = $this->config->getUserValue($userId, Application::APP_ID, 'enableSocialSync', 'no'); // automated background syncs for social avatars (default: no)
+ // allow users to retrieve avatars from social networks (default: yes)
+ $syncAllowedByAdmin = $this->config->getAppValue(Application::APP_ID, 'allowSocialSync', 'yes');
+ // automated background syncs for social avatars (default: no)
+ $bgSyncEnabledByUser = $this->config->getUserValue($userId, Application::APP_ID, 'enableSocialSync', 'no');
$this->initialStateService->provideInitialState(Application::APP_ID, 'locales', $locales);
$this->initialStateService->provideInitialState(Application::APP_ID, 'defaultProfile', $defaultProfile);
$this->initialStateService->provideInitialState(Application::APP_ID, 'supportedNetworks', $supportedNetworks);
- $this->initialStateService->provideInitialState(Application::APP_ID, 'locales', $locales);
- $this->initialStateService->provideInitialState(Application::APP_ID, 'defaultProfile', $defaultProfile);
- $this->initialStateService->provideInitialState(Application::APP_ID, 'supportedNetworks', $supportedNetworks);
$this->initialStateService->provideInitialState(Application::APP_ID, 'allowSocialSync', $syncAllowedByAdmin);
$this->initialStateService->provideInitialState(Application::APP_ID, 'enableSocialSync', $bgSyncEnabledByUser);
$this->initialStateService->provideInitialState(Application::APP_ID, 'contactsinteraction', $this->appManager->isEnabledForUser('contactsinteraction') === true);
diff --git a/templates/main.php b/templates/main.php
index 13478097..0d27e7f3 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,5 +1,5 @@
<?php
-if (\OCP\Util::isIe()) {
+if (\OC_Util::isIe()) {
?>
<div id="app-content">
<div class="emptycontent">