From 071851dfd789dcb9098a72a742df3d1106598539 Mon Sep 17 00:00:00 2001 From: "chanial%noos.fr" Date: Wed, 12 Sep 2007 17:50:25 +0000 Subject: [PATCH] Fix adding a group of tab and bookmark transaction manager horking in phoenix. Allow the insertion of a resource in a valid container that isn't in the bookmark graph. Not part of the build git-svn-id: svn://10.0.0.236/trunk@235820 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/browser/src/nsBookmarksService.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/suite/browser/src/nsBookmarksService.cpp b/mozilla/suite/browser/src/nsBookmarksService.cpp index 6fee7c3e1c6..f81e48ec87e 100644 --- a/mozilla/suite/browser/src/nsBookmarksService.cpp +++ b/mozilla/suite/browser/src/nsBookmarksService.cpp @@ -5470,8 +5470,11 @@ nsBookmarksService::CanAccept(nsIRDFResource* aSource, nsresult rv; PRBool isBookmarkedFlag = PR_FALSE, canAcceptFlag = PR_FALSE, isOrdinal; - if (NS_SUCCEEDED(rv = IsBookmarkedInternal(aSource, &isBookmarkedFlag)) && + if ( +#ifndef MOZ_PHOENIX + NS_SUCCEEDED(rv = IsBookmarkedInternal(aSource, &isBookmarkedFlag)) && (isBookmarkedFlag == PR_TRUE) && +#endif (NS_SUCCEEDED(rv = gRDFC->IsOrdinalProperty(aProperty, &isOrdinal)))) { if (isOrdinal == PR_TRUE)