diff options
| author | Marcin Łojewski <marcin.lojewski@mlojewski.me> | 2020-02-02 22:52:46 +0300 |
|---|---|---|
| committer | Marcin Łojewski <marcin.lojewski@mlojewski.me> | 2020-02-02 22:52:46 +0300 |
| commit | c2c56ba96abdcb80879fc07d090019c89daec8e5 (patch) | |
| tree | da5251a8d146a537c5ab3197734d296ea67c70f2 | |
| parent | 7ff970455df195db268537a5b932e12b1db7cfbc (diff) | |
| parent | 171add734381cbb5673c8a92f83edcc61f737c39 (diff) | |
Merge branch 'master' into develop
# Conflicts:
# CHANGELOG.md
# appinfo/info.xml
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | lib/Backend/UserBackend.php | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ac6c97c..992be77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [4.4.1] - 2020-02-02 +### Fixed +- Issue generating 'Object of class Closure could not be converted to string' log message + ## [4.4.0] - 2019-10-09 ### Added - Users can confirm passwords @@ -136,7 +140,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Supported version of ownCloud, Nextcloud: ownCloud 10, Nextcloud 12 -[Unreleased]: https://github.com/nextcloud/user_sql/compare/v4.4.0...develop +[Unreleased]: https://github.com/nextcloud/user_sql/compare/v4.4.1...develop +[4.4.1]: https://github.com/nextcloud/user_sql/compare/v4.4.0...v4.4.1 [4.4.0]: https://github.com/nextcloud/user_sql/compare/v4.3.0...v4.4.0 [4.3.0]: https://github.com/nextcloud/user_sql/compare/v4.2.1...v4.3.0 [4.2.1]: https://github.com/nextcloud/user_sql/compare/v4.2.0...v4.2.1 diff --git a/lib/Backend/UserBackend.php b/lib/Backend/UserBackend.php index 22dc213..a97e095 100644 --- a/lib/Backend/UserBackend.php +++ b/lib/Backend/UserBackend.php @@ -437,11 +437,10 @@ final class UserBackend extends ABackend implements /** * @inheritdoc */ - public function getUsers( - $search = "", $limit = null, $offset = null, $callback = null - ) { + public function getUsers($search = "", $limit = null, $offset = null, $callback = null) + { $this->logger->debug( - "Entering getUsers($search, $limit, $offset, $callback)", + "Entering getUsers($search, $limit, $offset)", ["app" => $this->appName] ); @@ -478,7 +477,7 @@ final class UserBackend extends ABackend implements $this->cache->set($cacheKey, $users); $this->logger->debug( - "Returning getUsers($search, $limit, $offset, $callback): count(" + "Returning getUsers($search, $limit, $offset): count(" . count( $users ) . ")", ["app" => $this->appName] |