-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Fix languages empty array #20719
Fix languages empty array #20719
Conversation
38a752a
to
679c26e
Compare
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.
hmm, do we need to change also here? server/apps/settings/lib/Settings/Personal/PersonalInfo.php Lines 192 to 198 in b569f3c
|
679c26e
to
6727d07
Compare
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.
Didn't test but code looks good
/backport to stable18 |
9b68aa0
to
a8d1afc
Compare
9b68aa0
to
6213478
Compare
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.
CI failures:
There were 3 failures:
373
374 1) OCA\Provisioning_API\Tests\Controller\UsersControllerTest::testGetUserDataAsAdmin
375 Failed asserting that two arrays are equal.
376 --- Expected
377 +++ Actual
378 @@ @@
379 'website' => 'website'
380 'twitter' => 'twitter'
381 'groups' => Array (...)
382 - 'language' => 'de'
383 + 'language' => null
384 'locale' => null
385 'backendCapabilities' => Array (...)
386 )
387
388 /drone/src/apps/provisioning_api/tests/Controller/UsersControllerTest.php:1019
389
390 2) OCA\Provisioning_API\Tests\Controller\UsersControllerTest::testGetUserDataAsSubAdminAndUserIsAccessible
391 Failed asserting that two arrays are equal.
392 --- Expected
393 +++ Actual
394 @@ @@
395 'website' => 'website'
396 'twitter' => 'twitter'
397 'groups' => Array ()
398 - 'language' => 'da'
399 + 'language' => null
400 'locale' => null
401 'backendCapabilities' => Array (...)
402 )
403
404 /drone/src/apps/provisioning_api/tests/Controller/UsersControllerTest.php:1149
405
406 3) OCA\Provisioning_API\Tests\Controller\UsersControllerTest::testGetUserDataAsSubAdminSelfLookup
407 Failed asserting that two arrays are equal.
408 --- Expected
409 +++ Actual
410 @@ @@
411 'website' => 'website'
412 'twitter' => 'twitter'
413 'groups' => Array ()
414 - 'language' => 'ru'
415 + 'language' => null
416 'locale' => null
417 'backendCapabilities' => Array (...)
418 )
419
420 /drone/src/apps/provisioning_api/tests/Controller/UsersControllerTest.php:1319
421
422 --
/backport to stable19 |
6213478
to
cf401e8
Compare
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.
Tested and works 👍
Signed-off-by: GretaD <gretadoci@gmail.com>
cf401e8
to
fce716b
Compare
When the language is forced an error occurs:
this happens because the forcedLanguage returns empty array.
Should be backported to 18 too