Fix for bug 237964 (Allow editable areas in browser (contentEditable)). r/sr=sicking.

docshell/base/nsDocShellEditorData.cpp

@@ -73,7 +73,7 @@ nsDocShellEditorData::~nsDocShellEditorData()
     nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(mDocShell);
     // This will eventually call nsDocShellEditorData::SetEditor(nsnull)
     //   which will call mEditorPreDestroy() and delete the editor
-    mEditingSession->TearDownEditorOnWindow(domWindow);
+    mEditingSession->TearDownEditorOnWindow(domWindow, PR_TRUE);
   }
   else if (mEditor) // Should never have this w/o nsEditingSession!
   {
@@ -104,7 +104,8 @@ nsDocShellEditorData::MakeEditable(PRBool inWaitForUriLoad /*, PRBool inEditable
     mEditor = nsnull;
   }
   
-  mMakeEditable = PR_TRUE;
+  if (inWaitForUriLoad)
+    mMakeEditable = PR_TRUE;
   return NS_OK;
 }
 
@@ -191,6 +192,8 @@ nsDocShellEditorData::SetEditor(nsIEditor *inEditor)
     }
       
     mEditor = inEditor;    // owning addref
+    if (!mEditor)
+      mMakeEditable = PR_FALSE;
   }   
   
   return NS_OK;