aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--application/NetscapeBookmarkUtils.php1
2 files changed, 7 insertions, 0 deletions
diff --git a/README.md b/README.md
index cfdefc66..d57f5202 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,12 @@ dailymotion, flickr, imageshack, imgur, vimeo, xkcd, youtube...
85- URL cleanup: automatic removal of `?utm_source=...`, `fb=...` 85- URL cleanup: automatic removal of `?utm_source=...`, `fb=...`
86- discreet pop-up notification when a new release is available 86- discreet pop-up notification when a new release is available
87 87
88### REST API
89
90Easily extensible by any client using the REST API exposed by Shaarli.
91
92See the [API documentation](http://shaarli.github.io/api-documentation/).
93
88### Other usages 94### Other usages
89Though Shaarli is primarily a bookmarking application, it can serve other purposes 95Though Shaarli is primarily a bookmarking application, it can serve other purposes
90(see [usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)): 96(see [usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)):
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++;