From 3f3774123cae075b4986c94a8346f0699ffb5390 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 28 Jun 2013 23:54:54 +0200
Subject: [PATCH] Fix Null titles and title with quotes from backend request
 fix #18

---
 js/bookmarks.js   | 5 ++++-
 lib/bookmarks.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/bookmarks.js b/js/bookmarks.js
index f66994c9..99b52584 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -279,7 +279,10 @@ function updateBookmarksList(bookmark, position) {
 	if(bookmark.added) {
 		bookmark.added_date.setTime(parseInt(bookmark.added)*1000);
 	}
-	
+
+	if(! bookmark.title)
+		bookmark.title ='';
+
 	html = tmpl("item_tmpl", bookmark);
 	if(position == "prepend") {
 		$('.bookmarks_list').prepend(html);
diff --git a/lib/bookmarks.php b/lib/bookmarks.php
index 7355dc8f..e414c206 100644
--- a/lib/bookmarks.php
+++ b/lib/bookmarks.php
@@ -435,7 +435,7 @@ class OC_Bookmarks_Bookmarks{
 		if($page) {
 			if(preg_match( "/<title>(.*)<\/title>/sUi", $page, $match ) !== false)
 				if(isset($match[1])) {
-					$metadata['title'] =  html_entity_decode($match[1], ENT_NOQUOTES , 'UTF-8');
+					$metadata['title'] =  html_entity_decode($match[1],  ENT_QUOTES , 'UTF-8');
 					//Not the best solution but....
 					$metadata['title'] = str_replace('&trade;', chr(153), $metadata['title']);
 					$metadata['title'] = str_replace('&dash;', '‐', $metadata['title']);