Merge branch 'master' into develop
# Conflicts: # CHANGELOG.md # appinfo/info.xml
This commit is contained in:
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||||||
|
|
||||||
## [Unreleased]
|
## [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
|
## [4.4.0] - 2019-10-09
|
||||||
### Added
|
### Added
|
||||||
- Users can confirm passwords
|
- Users can confirm passwords
|
||||||
@@ -136,7 +140,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||||||
### Changed
|
### Changed
|
||||||
- Supported version of ownCloud, Nextcloud: ownCloud 10, Nextcloud 12
|
- 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.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.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
|
[4.2.1]: https://github.com/nextcloud/user_sql/compare/v4.2.0...v4.2.1
|
||||||
|
|||||||
@@ -437,11 +437,10 @@ final class UserBackend extends ABackend implements
|
|||||||
/**
|
/**
|
||||||
* @inheritdoc
|
* @inheritdoc
|
||||||
*/
|
*/
|
||||||
public function getUsers(
|
public function getUsers($search = "", $limit = null, $offset = null, $callback = null)
|
||||||
$search = "", $limit = null, $offset = null, $callback = null
|
{
|
||||||
) {
|
|
||||||
$this->logger->debug(
|
$this->logger->debug(
|
||||||
"Entering getUsers($search, $limit, $offset, $callback)",
|
"Entering getUsers($search, $limit, $offset)",
|
||||||
["app" => $this->appName]
|
["app" => $this->appName]
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -478,7 +477,7 @@ final class UserBackend extends ABackend implements
|
|||||||
|
|
||||||
$this->cache->set($cacheKey, $users);
|
$this->cache->set($cacheKey, $users);
|
||||||
$this->logger->debug(
|
$this->logger->debug(
|
||||||
"Returning getUsers($search, $limit, $offset, $callback): count("
|
"Returning getUsers($search, $limit, $offset): count("
|
||||||
. count(
|
. count(
|
||||||
$users
|
$users
|
||||||
) . ")", ["app" => $this->appName]
|
) . ")", ["app" => $this->appName]
|
||||||
|
|||||||
Reference in New Issue
Block a user