Bug 546253 - moz_openpages_temp table needs to describe pages that may not be in moz_places. r=sdwilsh a=blocking

2010-08-13 21:53:05 -04:00
parent 3a4ec2ab49
commit 79a968f50c
6 changed files with 68 additions and 58 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -8098,7 +8098,11 @@ nsDocShell::InternalLoad(nsIURI * aURI,

            /* Set the title for the Global History entry for this anchor url.
             */
-            if (mGlobalHistory) {
+            nsCOMPtr<IHistory> history = services::GetHistoryService();
+            if (history) {
+                history->SetURITitle(aURI, mTitle);
+            }
+            else if (mGlobalHistory) {
                mGlobalHistory->SetPageTitle(aURI, mTitle);
            }