From 1d33c3fd07fbfa41359af0e99079f57f022e7124 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 22 Mar 2010 16:56:55 +0000
Subject: Merged 1.7 bugfixes back into core. (5376:HEAD).

git-svn-id: http://code.elgg.org/elgg/trunk@5471 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/bookmarks/views/default/bookmarks/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mod/bookmarks/views/default')

diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php
index 9372dc7cb..b72863841 100644
--- a/mod/bookmarks/views/default/bookmarks/form.php
+++ b/mod/bookmarks/views/default/bookmarks/form.php
@@ -22,6 +22,7 @@ if(isset($vars['entity'])){
 	//set some variables
 	$guid = '';
 	$title = get_input('title',"");
+	$title = stripslashes($title); // strip slashes from URL encoded apostrophes
 	$address = get_input('address',"");
 	$notes = '';
 	if ($address == "previous")
@@ -108,4 +109,4 @@ if(isset($vars['entity'])){
 		<input type="hidden" value="<?php echo $guid; ?>" name="guid" />
 		<input type="submit" onfocus="blur()" value="<?php echo elgg_echo('save'); ?>" />
 	</p>
-</form>
\ No newline at end of file
+</form>
-- 
cgit v1.2.3