Allow injecting the user temporarily for direct editing #44295
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Signed-off-by: Julius Härtl <[email protected]>
juliusknorr
force-pushed
the
fix/direct-edit-incognito
branch
from
7a6ee18 to
e6331a7
Compare
juliusknorr
force-pushed
the
fix/direct-edit-incognito
branch
from
e6331a7 to
7d65d93
Compare
juliusknorr
requested review from
ChristophWurst,
blizzz,
mejo-,
a team,
ArtificialOwl,
artonge and
nfebe
and removed request for
a team
juliusknorr
changed the title
nfebe
reviewed
Mar 19, 2024
nfebe
approved these changes
Mar 19, 2024
juliusknorr
force-pushed
the
fix/direct-edit-incognito
branch
2 times, most recently
from
4131f98 to
07691d3
Compare
Signed-off-by: Julius Härtl <[email protected]>
juliusknorr
force-pushed
the
fix/direct-edit-incognito
branch
from
07691d3 to
e330efe
Compare
blizzz
approved these changes
Mar 21, 2024
Merged
4 tasks
| @@ -338,7 +339,7 @@ public static function isAdminUser($uid) { | |||
| * @return string|false uid or false | |||
| */ | |||
| public static function getUser() { | |||
| $uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null; | |||
| $uid = Server::get(IUserSession::class)->getUser()?->getUID(); | |||
There was a problem hiding this comment.
This breaks logging with debug when ldap is enabled:
#44400
|
/backport to stable29 |
|
/backport to stable28 |
|
/backport to stable27 |
3 tasks
This was referenced Jul 22, 2024
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Groupfolders
Fix ONLYOFFICE/onlyoffice-nextcloud#900 with ONLYOFFICE/onlyoffice-nextcloud#967