diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
| commit | 4b80466880b4e2daf25e38d621a0ebac608d335d (patch) | |
| tree | dfdcac5eb81cea7853d16c50ea3043c4642f3c15 /core/templates | |
| parent | 78a3625ddfc67e7e6743a2ff6fd31e1566b174c8 (diff) | |
| parent | 9058d398a7b9aac58ab4aa7379e13ca83c72281d (diff) | |
| download | nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.tar.gz nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/exception.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/exception.php b/core/templates/exception.php index 47792225557..62d6cf2ade5 100644 --- a/core/templates/exception.php +++ b/core/templates/exception.php @@ -20,11 +20,11 @@ echo 'Request Method: ' . $_['sysinfo']['requestmethod'] . "\n"; echo 'Database: ' . $_['sysinfo']['database'] . "\n"; echo '</textarea>'; - }else{ + } else { echo 'Your administrator has disabled systeminformations.'; } ?> </p> </details> </li> -</ul>
\ No newline at end of file +</ul> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index c8b580b5fd9..38aa31be32b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,7 +31,7 @@ <ul id="settings" class="svg"> <span id="expand"> - <?php echo OCP\User::getDisplayName($user=null)?OCP\User::getDisplayName($user=null):(OC_User::getUser()?OC_User::getUser():'') ?> + <?php echo OCP\User::getDisplayName($user=null)?OC_Util::sanitizeHTML(OCP\User::getDisplayName($user=null)):(OC_User::getUser()?OC_User::getUser():'') ?> <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" /> </span> <div id="expanddiv"> |