diff options
author | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:34:30 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:34:30 +0200 |
commit | 38672ba0d1c722e5d6d33a58255ceb55e9410e46 (patch) | |
tree | dae4c7c47532380eac3ae641db99122fc77c93dc /application/api/controllers/History.php | |
parent | 83faedadff76c5bdca036f39f13943f63b27e164 (diff) | |
parent | 1e77e0448bbd25675d8c0fe4a73206ad9048904b (diff) | |
download | Shaarli-38672ba0d1c722e5d6d33a58255ceb55e9410e46.tar.gz Shaarli-38672ba0d1c722e5d6d33a58255ceb55e9410e46.tar.zst Shaarli-38672ba0d1c722e5d6d33a58255ceb55e9410e46.zip |
Merge tag 'v0.10.4' into stable
Release v0.10.4
Diffstat (limited to 'application/api/controllers/History.php')
-rw-r--r-- | application/api/controllers/History.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/application/api/controllers/History.php b/application/api/controllers/History.php index 2ff9deaf..4582e8b2 100644 --- a/application/api/controllers/History.php +++ b/application/api/controllers/History.php | |||
@@ -35,8 +35,7 @@ class History extends ApiController | |||
35 | $offset = $request->getParam('offset'); | 35 | $offset = $request->getParam('offset'); |
36 | if (empty($offset)) { | 36 | if (empty($offset)) { |
37 | $offset = 0; | 37 | $offset = 0; |
38 | } | 38 | } elseif (ctype_digit($offset)) { |
39 | else if (ctype_digit($offset)) { | ||
40 | $offset = (int) $offset; | 39 | $offset = (int) $offset; |
41 | } else { | 40 | } else { |
42 | throw new ApiBadParametersException('Invalid offset'); | 41 | throw new ApiBadParametersException('Invalid offset'); |
@@ -46,7 +45,7 @@ class History extends ApiController | |||
46 | $limit = $request->getParam('limit'); | 45 | $limit = $request->getParam('limit'); |
47 | if (empty($limit)) { | 46 | if (empty($limit)) { |
48 | $limit = count($history); | 47 | $limit = count($history); |
49 | } else if (ctype_digit($limit)) { | 48 | } elseif (ctype_digit($limit)) { |
50 | $limit = (int) $limit; | 49 | $limit = (int) $limit; |
51 | } else { | 50 | } else { |
52 | throw new ApiBadParametersException('Invalid limit'); | 51 | throw new ApiBadParametersException('Invalid limit'); |