diff options
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | core/css/header.scss | 1 | ||||
| -rw-r--r-- | lib/private/Repair/NC13/RepairInvalidPaths.php | 2 | ||||
| -rw-r--r-- | lib/private/User/Manager.php | 3 |
4 files changed, 5 insertions, 1 deletions
diff --git a/3rdparty b/3rdparty -Subproject cae79927de50c6ab0bf77e5653015b6579ae2ae +Subproject 0f63176a768476f5f145315f510104fd1e372f3 diff --git a/core/css/header.scss b/core/css/header.scss index c4d4205103a..2e06c13d223 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -272,6 +272,7 @@ nav { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + max-width: 110px; } svg, span { diff --git a/lib/private/Repair/NC13/RepairInvalidPaths.php b/lib/private/Repair/NC13/RepairInvalidPaths.php index cf0b9e7783e..efc682bf44f 100644 --- a/lib/private/Repair/NC13/RepairInvalidPaths.php +++ b/lib/private/Repair/NC13/RepairInvalidPaths.php @@ -76,7 +76,7 @@ class RepairInvalidPaths implements IRepairStep { yield $row; } $result->closeCursor(); - } while (count($rows) >= self::MAX_ROWS); + } while (count($rows) > 0); } private function getId($storage, $path) { diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index c04f426c2cf..ded807a223b 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -126,6 +126,9 @@ class Manager extends PublicEmitter implements IUserManager { * @return \OC\User\User|null Either the user or null if the specified user does not exist */ public function get($uid) { + if (is_null($uid) || $uid === '' || $uid === false) { + return null; + } if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends return $this->cachedUsers[$uid]; } |