Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
lfeditor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
12
Issues
12
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TYPO3
lfeditor
Commits
c6535a96
Commit
c6535a96
authored
Mar 20, 2015
by
damjan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BUGFIX] Fixes invalid argument supplied for foreach
parent
3e7add0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
Classes/Service/FileOverrideService.php
Classes/Service/FileOverrideService.php
+11
-8
No files found.
Classes/Service/FileOverrideService.php
View file @
c6535a96
...
...
@@ -139,8 +139,8 @@ class FileOverrideService extends FileBaseXMLService {
try
{
SgLib
::
createDir
(
$this
->
absPath
,
PATH_site
);
}
catch
(
\
Exception
$e
)
{
throw
new
LFException
(
'failure.failure'
,
0
,
'('
.
$e
->
getMessage
()
.
')'
);
}
catch
(
\
Exception
$e
xception
)
{
throw
new
LFException
(
'failure.failure'
,
0
,
'('
.
$e
xception
->
getMessage
()
.
')'
);
}
parent
::
writeFile
();
...
...
@@ -159,8 +159,8 @@ class FileOverrideService extends FileBaseXMLService {
Typo3Lib
::
writeLineToAdditionalConfiguration
(
$addLine
);
$GLOBALS
[
'TYPO3_CONF_VARS'
][
'SYS'
][
'locallangXMLOverride'
][
$typo3ExtRelativeFilePath
][
0
]
=
$relativeOverrideFilePath
;
}
catch
(
\
Exception
$e
)
{
throw
new
LFException
(
'failure.failure'
,
0
,
'('
.
$e
->
getMessage
()
.
')'
);
}
catch
(
\
Exception
$e
xception
)
{
throw
new
LFException
(
'failure.failure'
,
0
,
'('
.
$e
xception
->
getMessage
()
.
')'
);
}
}
...
...
@@ -171,11 +171,14 @@ class FileOverrideService extends FileBaseXMLService {
* @return void
*/
public
function
deleteDuplicates
()
{
foreach
(
$this
->
localLang
as
$lang
=>
$langData
)
{
foreach
(
$langData
as
$constKey
=>
$constValue
)
{
$localLangData
=
$this
->
originalFileObject
->
getLocalLangData
(
$lang
);
foreach
(
$this
->
localLang
as
$language
=>
$languageData
)
{
if
(
!
is_array
(
$languageData
))
{
continue
;
}
foreach
(
$languageData
as
$constKey
=>
$constValue
)
{
$localLangData
=
$this
->
originalFileObject
->
getLocalLangData
(
$language
);
if
(
SgLib
::
strCmpIgnoreCRConvertLF
(
$constValue
,
$localLangData
[
$constKey
]))
{
unset
(
$this
->
localLang
[
$lang
][
$constKey
]);
unset
(
$this
->
localLang
[
$lang
uage
][
$constKey
]);
}
}
}
...
...
Write
Preview
Markdown
is supported
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