nextcloud / server

apps/user_ldap/lib/User/User.php

Braces +1 added lines, -2 removed lines

@@ -652,8 +652,7 @@
 				$currentValue = $accountProperty->getValue();
 				$scope = ($accountProperty->getScope() ? $accountProperty->getScope()
 					: $defaultScopes[$property]);
-			}
-			catch (PropertyDoesNotExistException $e) { // thrown at getProperty
+			} catch (PropertyDoesNotExistException $e) { // thrown at getProperty
 				$this->logger->error('property does not exist: '.$property
 					.' for uid='.$this->uid.''
 					, ['app' => 'user_ldap', 'exception' => $e]);

core/templates/404.php

Braces +5 added lines, -2 removed lines

@@ -14,10 +14,13 @@
 ?>
 <?php if (isset($_['content'])): ?>
 	<?php print_unescaped($_['content']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
 	<div class="body-login-container update">
 		<div class="icon-big icon-search"></div>
-		<h2><?php p($l->t('Page not found')); ?></h2>
+		<h2><?php p($l->t('Page not found'));
+}
+?></h2>
 		<p class="infogroup"><?php p($l->t('The page could not be found on the server or you may not be allowed to view it.')); ?></p>
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
 			<?php p($l->t('Back to %s', [$theme->getName()])); ?>