Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
TYPO3
lfeditor
Commits
4333cb69
Commit
4333cb69
authored
Apr 03, 2018
by
Fabian Galinski
😾
Browse files
[BUGFIX] Loading sys_language records fails with MySQL 5.7
Fixes
#11
parent
165b07d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Classes/Service/ConfigurationService.php
View file @
4333cb69
...
...
@@ -703,13 +703,12 @@ class ConfigurationService extends AbstractService {
* @return array
*/
protected
function
narrowToUserLanguages
(
array
$languages
,
BackendUserAuthentication
$backendUser
)
{
if
(
!
empty
(
$backendUser
)
&&
!
$backendUser
->
isAdmin
())
{
/** @var SysLanguageService $sysLanguageService */
$sysLanguageService
=
$this
->
objectManager
->
get
(
'SGalinski\Lfeditor\Service\SysLanguageService'
);
if
(
$backendUser
!==
NULL
&&
!
$backendUser
->
isAdmin
())
{
$sysLanguageService
=
$this
->
objectManager
->
get
(
SysLanguageService
::
class
);
foreach
(
$languages
as
$index
=>
$languageFlag
)
{
$sysLanguageId
=
$sysLanguageService
->
getSysLanguageIdByFlag
(
$languageFlag
);
if
(
$languageFlag
===
'default'
||
$sysLanguageId
!==
NULL
&&
$backendUser
->
checkLanguageAccess
(
$sysLanguageId
)
||
(
$sysLanguageId
!==
NULL
&&
$backendUser
->
checkLanguageAccess
(
$sysLanguageId
)
)
)
{
continue
;
}
...
...
Classes/Service/SysLanguageService.php
View file @
4333cb69
...
...
@@ -53,8 +53,9 @@ class SysLanguageService extends AbstractService {
'uid, title, flag'
,
'sys_language'
,
(
$uids
!==
NULL
?
'uid IN ('
.
$typo3Db
->
cleanIntList
(
$uids
)
.
')'
:
''
),
'flag
ASC
'
'flag
, uid
'
);
$sysLanguageList
=
[];
while
(
$row
=
$typo3Db
->
sql_fetch_assoc
(
$res
))
{
$sysLanguageList
[
$row
[
'flag'
]][
'uid'
]
=
$row
[
'uid'
];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment