Merge pull request #769 from ArthurHoaro/api/getlinks-visibility

REST API - getLinks: support the visibility parameter

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04aacad6287d0c60a656093c9351d9d88e454b34..7e98a5ad0d1dd4beee9b18df6a46b07cccfa757c 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,12 @@ configuration to enable URL rewriting, see:
 - Fix permalink image alignment in daily page
 - Fix the delete button in `editlink`
 
+## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20
+
+### Fixed
+
+- PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template.
+
 ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15
 
 ### Fixed

diff --git a/application/Updater.php b/application/Updater.php
index eb03c6d3afe6cc6be66062fb2050ac6dfe3170b5..90aba74508faa33472d3bc6a754f127cf1a8e066 100644 (file)
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -132,21 +132,6 @@ class Updater
         return true;
     }
 
-    /**
-     * Rename tags starting with a '-' to work with tag exclusion search.
-     */
-    public function updateMethodRenameDashTags()
-    {
-        $linklist = $this->linkDB->filterSearch();
-        foreach ($linklist as $key => $link) {
-            $link['tags'] = preg_replace('/(^| )\-/', '$1', $link['tags']);
-            $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true)));
-            $this->linkDB[$key] = $link;
-        }
-        $this->linkDB->save($this->conf->get('resource.page_cache'));
-        return true;
-    }
-
     /**
      * Move old configuration in PHP to the new config system in JSON format.
      *
@@ -257,6 +242,21 @@ class Updater
         return true;
     }
 
+    /**
+     * Rename tags starting with a '-' to work with tag exclusion search.
+     */
+    public function updateMethodRenameDashTags()
+    {
+        $linklist = $this->linkDB->filterSearch();
+        foreach ($linklist as $key => $link) {
+            $link['tags'] = preg_replace('/(^| )\-/', '$1', $link['tags']);
+            $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true)));
+            $this->linkDB[$key] = $link;
+        }
+        $this->linkDB->save($this->conf->get('resource.page_cache'));
+        return true;
+    }
+
     /**
      * Initialize API settings:
      *   - api.enabled: true

diff --git a/index.php b/index.php
index b62149f647f469556d1f1a5c99120e22a9702aac..d1eee09850e1dac86531be917c7c5c3a3d3e12ec 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Shaarli v0.8.2 - Shaare your links...
+ * Shaarli v0.8.3 - Shaare your links...
  *
  * The personal, minimalist, super-fast, database free, bookmarking service.
  *

diff --git a/shaarli_version.php b/shaarli_version.php
index e93b0e7faddefb59af197be1d967edc72b01e369..3f79a4c608cf6ebdbb80baee552d86d423da0332 100644 (file)
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.8.2 */ ?>
+<?php /* 0.8.3 */ ?>