Merge pull request #4227 from nextcloud/stable10-error-messages

[Stable10] error messages

3 files changed, 5 insertions, 4 deletions

diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
index b14c72d83a5..7923c0aa011 100644
--- a/apps/updatenotification/templates/admin.php
+++ b/apps/updatenotification/templates/admin.php
@@ -30,7 +30,7 @@
 			<a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a>
 		<?php } ?>
 	<?php } else { ?>
-		<strong><?php print_unescaped($l->t('Your version is up to date.')); ?></strong>
+		<strong><?php p($l->t('Your version is up to date.')); ?></strong>
 		<span class="icon-info svg" title="<?php p($l->t('Checked on %s', [$lastCheckedDate])) ?>"></span>
 	<?php } ?>
 
diff --git a/core/templates/error.php b/core/templates/error.php
index 6e044b72414..b5e8c8eab3f 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -3,7 +3,7 @@
 		<li class='error'>
 			<?php p($error['error']) ?><br>
 			<?php if(isset($error['hint']) && $error['hint']): ?>
-				<p class='hint'><?php print_unescaped($error['hint']) ?></p>
+				<p class='hint'><?php p($error['hint']) ?></p>
 			<?php endif;?>
 		</li>
 	<?php endforeach ?>
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 0d63fd46ecc..435d49841ee 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -372,9 +372,10 @@ class Local extends \OC\Files\Storage\Common {
 		}
 		if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
 			return $fullPath;
-		} else {
-			throw new ForbiddenException("Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", false);
 		}
+
+		\OCP\Util::writeLog('core',  "Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", \OCP\Util::ERROR);
+		throw new ForbiddenException('Following symlinks is not allowed', false);
 	}
 
 	/**