diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-02-02 17:47:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 17:47:52 +0100 |
| commit | fa311a4cae5ea526e848adc4f49c6aa0b700702c (patch) | |
| tree | d9ef343b8b5bb0c000a5409e0d6e6e0ca89f3eb6 | |
| parent | f8f3dc70b6208d94991e52e9e034ac05e8bdac03 (diff) | |
| parent | aaa9fc180ad79f8f8a1f1f8868f9f4e372d0ac56 (diff) | |
| download | UXP-fa311a4cae5ea526e848adc4f49c6aa0b700702c.tar UXP-fa311a4cae5ea526e848adc4f49c6aa0b700702c.tar.gz UXP-fa311a4cae5ea526e848adc4f49c6aa0b700702c.tar.lz UXP-fa311a4cae5ea526e848adc4f49c6aa0b700702c.tar.xz UXP-fa311a4cae5ea526e848adc4f49c6aa0b700702c.zip | |
Merge pull request #958 from Ascrod/master
Pale Moon: Use file path for bookmarks import/export.
| -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); } }; |