diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-10-13 12:05:08 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-13 12:05:08 +0200 |
| commit | b6f678a5a1d15acf284ebcec16c905e976671ce1 (patch) | |
| tree | 33c7da831482ed79c44896ef19c73c72ada84f2e /application/api/controllers/HistoryController.php | |
| parent | b14687036b9b800681197f51fdc47e62f0c88e2e (diff) | |
| parent | 1c1520b6b98ab20201bfe15577782a52320339df (diff) | |
| download | Shaarli-b6f678a5a1d15acf284ebcec16c905e976671ce1.tar.gz Shaarli-b6f678a5a1d15acf284ebcec16c905e976671ce1.tar.zst Shaarli-b6f678a5a1d15acf284ebcec16c905e976671ce1.zip | |
Merge branch 'v0.12' into latest
Diffstat (limited to 'application/api/controllers/HistoryController.php')
| -rw-r--r-- | application/api/controllers/HistoryController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/api/controllers/HistoryController.php b/application/api/controllers/HistoryController.php index 9afcfa26..505647a9 100644 --- a/application/api/controllers/HistoryController.php +++ b/application/api/controllers/HistoryController.php | |||
| @@ -41,7 +41,7 @@ class HistoryController extends ApiController | |||
| 41 | throw new ApiBadParametersException('Invalid offset'); | 41 | throw new ApiBadParametersException('Invalid offset'); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | // limit parameter is either a number of links or 'all' for everything. | 44 | // limit parameter is either a number of bookmarks or 'all' for everything. |
| 45 | $limit = $request->getParam('limit'); | 45 | $limit = $request->getParam('limit'); |
| 46 | if (empty($limit)) { | 46 | if (empty($limit)) { |
| 47 | $limit = count($history); | 47 | $limit = count($history); |