Changes to get new features work for impersonate app

Signed-off-by: Sujith H <sharidasan@owncloud.com>
owncloud · Apr 12, 2017 · b474d4c · b474d4c
1 parent 0505659
commit b474d4c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
@@ -88,7 +88,13 @@
 					</li>
 				<?php endforeach; ?>
 					<li>
-						<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
+						<a id="logout" <?php
+						if(\OC::$server->getAppConfig()->getValue('impersonate', 'enabled', '') !== '') {
+							p($l->t('href="#"'));
+						} else {
+							print_unescaped(OC_User::getLogoutAttribute());
+						}
+						?>>
 							<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>">
 							<?php p($l->t('Log out'));?>
 						</a>

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -63,6 +63,8 @@ public function __construct( $renderAs, $appId = '' ) {
 		// yes - should be injected ....
 		$this->config = \OC::$server->getConfig();
 
+		\OC::$server->getEventDispatcher()->dispatch('OC\TemplateLayout::loadAdditionalScripts');
+
 		// Decide which page we show
 		if($renderAs == 'user') {
 			parent::__construct( 'core', 'layout.user' );