diff options
| author | Brice Maron <brice@bmaron.net> | 2011-10-18 23:27:53 +0200 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2011-10-18 23:27:53 +0200 |
| commit | da8d32ae38acdab576a30ca56b30579f427c780d (patch) | |
| tree | a0c4c7049d73508aaad072bad7138a970595da8b /apps/bookmarks | |
| parent | 9ea34250a0d2e6c058d8869e0259026c083fa41e (diff) | |
| download | nextcloud-server-da8d32ae38acdab576a30ca56b30579f427c780d.tar.gz nextcloud-server-da8d32ae38acdab576a30ca56b30579f427c780d.zip | |
Tweak bookmarklet to not change the current page. Correct encoding when add bookmark
Diffstat (limited to 'apps/bookmarks')
| -rw-r--r-- | apps/bookmarks/addBm.php | 4 | ||||
| -rw-r--r-- | apps/bookmarks/templates/settings.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php index a7cdcee8faa..62ad5821dbf 100644 --- a/apps/bookmarks/addBm.php +++ b/apps/bookmarks/addBm.php @@ -39,7 +39,7 @@ $tmpl = new OC_Template( 'bookmarks', 'addBm', 'user' ); $url = isset($_GET['url']) ? urldecode($_GET['url']) : ''; $metadata = getURLMetadata($url); -$tmpl->assign('URL', htmlentities($metadata['url'])); -$tmpl->assign('TITLE', htmlentities($metadata['title'])); +$tmpl->assign('URL', htmlentities($metadata['url'],ENT_COMPAT,'utf-8')); +$tmpl->assign('TITLE', htmlentities($metadata['title'],ENT_COMPAT,'utf-8')); $tmpl->printPage(); diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php index b7da441c2f8..97b6b256c09 100644 --- a/apps/bookmarks/templates/settings.php +++ b/apps/bookmarks/templates/settings.php @@ -8,7 +8,7 @@ ?> <form id="bookmarks"> <fieldset class="personalblock"> - <span class="bold"><?php echo $l->t('Bookmarklet:');?></span> <a class="bookmarks_addBml" href="javascript:var url = encodeURIComponent(location.href);window.open('<?php echo OC_Helper::linkTo('bookmarks', 'addBm.php', null, true); ?>?url='+url, 'owncloud-bookmarks');"><?php echo $l->t('Add page to ownCloud'); ?></a> + <span class="bold"><?php echo $l->t('Bookmarklet:');?></span> <a class="bookmarks_addBml" href="javascript:(function(){url=encodeURIComponent(location.href);window.open('<?php echo OC_Helper::linkTo('bookmarks', 'addBm.php', null, true); ?>?url='+url, 'owncloud-bookmarks') })()"><?php echo $l->t('Add page to ownCloud'); ?></a> <br/><em><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></em><br /> </fieldset> </form> |