diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-17 15:38:28 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-17 15:38:28 -0400 |
| commit | cbfbbe672cb4b1d03269891927edbb6059b67be9 (patch) | |
| tree | 924957a8bbba2e1fb4c87b1a2d8e2e67ac6e4aef /apps/bookmarks | |
| parent | cf181e88bb984f728c77ad01dcbcf87f2cc4aa7a (diff) | |
| parent | 6f981738bb5285d01e839ff640c163acf1b2a184 (diff) | |
| download | nextcloud-server-cbfbbe672cb4b1d03269891927edbb6059b67be9.tar.gz nextcloud-server-cbfbbe672cb4b1d03269891927edbb6059b67be9.zip | |
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
Diffstat (limited to 'apps/bookmarks')
| -rw-r--r-- | apps/bookmarks/templates/list.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php index ced6154c198..fdd2b19f79a 100644 --- a/apps/bookmarks/templates/list.php +++ b/apps/bookmarks/templates/list.php @@ -7,7 +7,7 @@ * See the COPYING-README file. */ ?> -<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo htmlentities($_GET['tag']); ?>" /> +<input type="hidden" id="bookmarkFilterTag" value="<?php if(isset($_GET['tag'])) echo htmlentities($_GET['tag'],ENT_COMPAT,'utf-8'); ?>" /> <div id="controls"> <input type="hidden" id="bookmark_add_id" value="0" /> <input type="text" id="bookmark_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="bookmarks_input" /> |