aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2016-08-13 13:59:12 +0200
committerGitHub <noreply@github.com>2016-08-13 13:59:12 +0200
commitf396134bf1b6080f9cfc55f46c59cd50f440f556 (patch)
tree66bf1b75a3bfd4f1862cd06e0a4c1d162e365ca9 /application
parenta34d6da642acda37b04e4c5d732d42a84df65068 (diff)
parentf4ad7bde56b769cea0a2a26eb739e57500705555 (diff)
downloadShaarli-f396134bf1b6080f9cfc55f46c59cd50f440f556.tar.gz
Shaarli-f396134bf1b6080f9cfc55f46c59cd50f440f556.tar.zst
Shaarli-f396134bf1b6080f9cfc55f46c59cd50f440f556.zip
Merge pull request #635 from virtualtam/fix/import/ie
Fix: ensure Internet Explorer bookmark dumps can be imported
Diffstat (limited to 'application')
-rw-r--r--application/NetscapeBookmarkUtils.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php
index b99a432e..c3181254 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/NetscapeBookmarkUtils.php
@@ -98,8 +98,7 @@ class NetscapeBookmarkUtils
98 $filesize = $files['filetoupload']['size']; 98 $filesize = $files['filetoupload']['size'];
99 $data = file_get_contents($files['filetoupload']['tmp_name']); 99 $data = file_get_contents($files['filetoupload']['tmp_name']);
100 100
101 // Sniff file type 101 if (strpos($data, '<!DOCTYPE NETSCAPE-Bookmark-file-1>') === false) {
102 if (! startsWith($data, '<!DOCTYPE NETSCAPE-Bookmark-file-1>')) {
103 return self::importStatus($filename, $filesize); 102 return self::importStatus($filename, $filesize);
104 } 103 }
105 104