diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-25 10:30:44 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-25 10:30:44 +0200 |
| commit | 79bf933319d4e62c3ba75e7f4eb6235d8ae60e4b (patch) | |
| tree | 1040a43eac9dfa6ee7c2213f49d34dbcf622f2c5 /core | |
| parent | 3d713e711bc00ce3f2615415307f26cfff518a36 (diff) | |
| parent | 9c2a6fb551487dad29cd327a5f357f2ac28e8edd (diff) | |
| download | nextcloud-server-79bf933319d4e62c3ba75e7f4eb6235d8ae60e4b.tar.gz nextcloud-server-79bf933319d4e62c3ba75e7f4eb6235d8ae60e4b.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core')
| -rw-r--r-- | core/img/filetypes/application-msexcel.png | bin | 0 -> 566 bytes | |||
| -rw-r--r-- | core/img/filetypes/application-mspowerpoint.png | bin | 0 -> 519 bytes | |||
| -rw-r--r-- | core/img/filetypes/application-msword.png | bin | 0 -> 28346 bytes | |||
| -rw-r--r-- | core/templates/login.php | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png Binary files differnew file mode 100644 index 00000000000..abcd93689a0 --- /dev/null +++ b/core/img/filetypes/application-msexcel.png diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png Binary files differnew file mode 100644 index 00000000000..b4aaad9a45c --- /dev/null +++ b/core/img/filetypes/application-mspowerpoint.png diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png Binary files differnew file mode 100644 index 00000000000..6f7bb520f25 --- /dev/null +++ b/core/img/filetypes/application-msword.png diff --git a/core/templates/login.php b/core/templates/login.php index a40bf5c330a..41d6ba41ef8 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,7 +1,7 @@ <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <form action="index.php" method="post"> <fieldset> - <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?> + <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?> <?php if($_['error']): ?> <a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a> <?php endif; ?> |
