aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-05-07 18:38:55 +0200
committerGitHub <noreply@github.com>2017-05-07 18:38:55 +0200
commit3108f2a8008280f857f56db50d6f0145d680b142 (patch)
treed01f6ca3ab9340734b3d003dcd849eac6dade897
parent5177d8e57427ac01e788079b8e61065f038df5d2 (diff)
parent28794b69cba22636ef22bd063a68732fd9ae6d6f (diff)
downloadShaarli-3108f2a8008280f857f56db50d6f0145d680b142.tar.gz
Shaarli-3108f2a8008280f857f56db50d6f0145d680b142.tar.zst
Shaarli-3108f2a8008280f857f56db50d6f0145d680b142.zip
Merge pull request #861 from ArthurHoaro/hotfix/import-shorturl-override
Fix a bug happening when importing links with override option
-rw-r--r--application/NetscapeBookmarkUtils.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php
index bbfde138..2a10ff22 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/NetscapeBookmarkUtils.php
@@ -180,6 +180,7 @@ class NetscapeBookmarkUtils
180 $newLink['id'] = $existingLink['id']; 180 $newLink['id'] = $existingLink['id'];
181 $newLink['created'] = $existingLink['created']; 181 $newLink['created'] = $existingLink['created'];
182 $newLink['updated'] = new DateTime(); 182 $newLink['updated'] = new DateTime();
183 $newLink['shorturl'] = $existingLink['shorturl'];
183 $linkDb[$existingLink['id']] = $newLink; 184 $linkDb[$existingLink['id']] = $newLink;
184 $importCount++; 185 $importCount++;
185 $overwriteCount++; 186 $overwriteCount++;