Skip to content

Commit 283ceaa

Browse files
committed
config: Fix Wallabag version type
The frontend compared the Wallabag version with a number using strict comparison since 16f1cd6. But when we switched to a custom configuration container in 1f194f8 (part to 2.19), we accidentally made the version a string breaking sharing to Wallabag. Bumping the API version since changes the type of field in `/api/about` endpoint, even though the fields are explicitly not part of the API promise.
1 parent 12f35fb commit 283ceaa

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

NEWS.md

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
- Fix errors in Firefox’s private browsing mode.
2424
- Fix exporting OPML when there are tags that look like numbers ([#1439](https://github.com/fossar/selfoss/pull/1439))
2525
- Fix incorrect handling of tags in MySQL backend, which could result in OPML export being broken ([#1439](https://github.com/fossar/selfoss/pull/1439))
26+
- Fix sharing to Wallabag 2. ([#1465](https://github.com/fossar/selfoss/pull/1465))
2627

2728
### Customization changes
2829
- Custom spouts must explicitly pass `null` to `Item::__construct()` when they do not need the `extraData` argument. ([#1415](https://github.com/fossar/selfoss/pull/1415))

docs/api-description.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"servers": [],
44
"info": {
55
"description": "You can access selfoss by using the same backend as selfoss user interface: The RESTful HTTP JSON API. There are a few urls where you can get information from selfoss and some for updating data. Assume you want all tags for rendering this in your own app. You have to make an HTTP GET call on the url /tags:\n\n```\nGET http://yourselfossurl.com/tags\n```\nThe result is following JSON formatted response (in this example two tags “blog” and “deviantart” are available:\n\n```\n[{\"tag\":\"blog\",\"color\":\"#251f10\",\"unread\":\"1\"},\n{\"tag\":\"deviantart\",\"color\":\"#e78e5c\",\"unread\":\"0\"}]\n```\n\nFollowing docs shows you which calls are possible and which response you can expect.",
6-
"version": "6.1.0",
6+
"version": "7.0.0",
77
"title": "selfoss"
88
},
99
"tags": [

src/constants.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
// independent of selfoss version
1010
// needs to be bumped each time public API is changed (follows semver)
1111
// keep in sync with docs/api-description.json
12-
const SELFOSS_API_VERSION = '6.1.0';
12+
const SELFOSS_API_VERSION = '7.0.0';

src/helpers/Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class Configuration {
124124

125125
public string $wallabag = '';
126126

127-
public string $wallabagVersion = '2';
127+
public int $wallabagVersion = 2;
128128

129129
public ?string $wordpress = null;
130130

0 commit comments

Comments
 (0)