diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
| commit | 0dca00b282fb06ec1512bccafd32e0a919242208 (patch) | |
| tree | 1f443869475eb32a8a8babfdf68b74b6d4d601cb /application/palemoon/components/places/content/places.js | |
| parent | 76fe52eb81db323ceaa8396de39b76efbce1c25e (diff) | |
| parent | 0b6d9a47051be9ef4d064c6f7c60717da91d0bc2 (diff) | |
| download | UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.gz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.lz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.xz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'application/palemoon/components/places/content/places.js')
| -rw-r--r-- | application/palemoon/components/places/content/places.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/palemoon/components/places/content/places.js b/application/palemoon/components/places/content/places.js index a94193823..40dbcb9b8 100644 --- a/application/palemoon/components/places/content/places.js +++ b/application/palemoon/components/places/content/places.js @@ -491,7 +491,7 @@ var PlacesOrganizer = { Task.spawn(function() { try { - yield BookmarkJSONUtils.importFromFile(aFile, true); + yield BookmarkJSONUtils.importFromFile(aFile.path, true); } catch(ex) { PlacesOrganizer._showErrorAlert(PlacesUIUtils.getString("bookmarksRestoreParseError")); } @@ -519,7 +519,7 @@ var PlacesOrganizer = { let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); let fpCallback = function fpCallback_done(aResult) { if (aResult != Ci.nsIFilePicker.returnCancel) { - BookmarkJSONUtils.exportToFile(fp.file); + BookmarkJSONUtils.exportToFile(fp.file.path); } }; |