-
Notifications
You must be signed in to change notification settings - Fork 19
add empty function composeAndStoreDisplayName #29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
@felixboehm, thanks for your PR! By analyzing the history of the files in this pull request, we identified @blizzz, @owncloud-bot and @nickvergessen to be potential reviewers. |
|
|
| * | ||
| * @param string $displayName | ||
| * @param string $displayName2 | ||
| * @returns string the effective display name |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@return
| /** | ||
| * Adding empty function to OfflineUser to avoid throwing error "function missing". | ||
| * Composes the display name and stores it in the database. The final | ||
| * display name is returned. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the description should only say what the function does, so: "Returns the given display name and doesn't store anything as this user is deleted"
|
👍 otherwise @jvillafanez can you give a quick comment in case you know a bit more about this piece ? |
|
To be backported down to 8.2 |
|
Hold on... Steps to reproduce:
Cannot reproduce the issue. A user marked as deleted cannot log in so the code will never reach However... what if the user is marked as deleted but at the same that this specific user was restored in LDAP ? Trying now... |
|
If I recreated "zombie400", the "isDeleted" flag automatically goes back to false. Will try again with 8.2, maybe 8.2 behaves differently. |
|
Boah, restored the wrong zombie... Will retest anyway |
|
I was able to reproduce on 8.2.9 only, but 9.0.6 is fine: Steps:
So this PR is not needed for master. @felixboehm Resend for 8.2 only ? |
|
copy&pasting the implementation of the lib/User/User.php file might be a better option |
|
What bothers me a lot is that it seems we're traversing an array containing different classes (User and OfflineUser) without checking the class, which is obviously wrong. Maybe the solution is already in 9.0.6? I think we should keep this on hold and check other solutions first. |
|
The solution is likely already on 9.0.6 as it works fine there. I wasn't able to reverse bisect because "the merge base is bad" or whatever, the bisect process doesn't continue. So might require some manual digging into logs. |
|
Looks like this is what we want: Looking for the commit id and PR now |
|
We'll need to backport that one to 8.2 I think. |
|
Ok, let's do that then. But I'm not sure we should release 8.2 in advance just for that one commit. |
@jvillafanez @PVince81
Adding an empty function to avoid "missing function" error, which is an issue in https://github.com/owncloud/enterprise/issues/1686