diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp
index 26b6c20d413..e83db28cf2a 100644
--- a/mozilla/editor/base/nsEditorShell.cpp
+++ b/mozilla/editor/base/nsEditorShell.cpp
@@ -1244,7 +1244,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType
   *_retval = nsnull;
   
   // TODO: DON'T ACCEPT NULL PARENT AFTER WIDGET IS FIXED
-  if (parent|| !(htmlFilter || imgFilter))
+  if (/*parent||*/ !(htmlFilter || imgFilter))
     return NS_ERROR_NOT_INITIALIZED;
 
 
diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp
index 26b6c20d413..e83db28cf2a 100644
--- a/mozilla/editor/composer/src/nsEditorShell.cpp
+++ b/mozilla/editor/composer/src/nsEditorShell.cpp
@@ -1244,7 +1244,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType
   *_retval = nsnull;
   
   // TODO: DON'T ACCEPT NULL PARENT AFTER WIDGET IS FIXED
-  if (parent|| !(htmlFilter || imgFilter))
+  if (/*parent||*/ !(htmlFilter || imgFilter))
     return NS_ERROR_NOT_INITIALIZED;