diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:20:25 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:20:25 +0200 |
| commit | 6b9072de581cf574f129bc1371355dbf91b818d8 (patch) | |
| tree | 2f15f77b0e4f85ef84d93d7409ab058c685275c0 /core/templates | |
| parent | c8cb870a27d1c2aa8ce1180114101cdcbccdf95b (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-6b9072de581cf574f129bc1371355dbf91b818d8.tar.gz nextcloud-server-6b9072de581cf574f129bc1371355dbf91b818d8.zip | |
fix merge conflicts
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/404.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/templates/404.php b/core/templates/404.php index 13a81010343..cd4f2b40bb2 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -10,6 +10,6 @@ if(!isset($_)){//also provide standalone error page <ul> <li class='error'> <?php echo $l->t( 'Cloud not found' ); ?><br/> - <p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p> + <p class='hint'><?php if(isset($_['file'])) echo htmlentities($_['file'])?></p> </li> </ul> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e1f8928fc9b..2bd2e20df70 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -28,7 +28,7 @@ <body id="body-login"> <div id="login"> <header><div id="header"> - <img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /> + <img src="<?php echo image_path('', 'logo.png'); ?>" alt="ownCloud" /> </div></header> <?php echo $_['content']; ?> </div> |