Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
dbd176cf
Commit
dbd176cf
authored
Jun 27, 2016
by
Vincent Petry
Committed by
GitHub
Jun 27, 2016
Browse files
Merge pull request #25258 from owncloud/integritycheck-whennotinstalled
Make code integrity check work when OC is not installed yet
parents
9681bf7c
d345047b
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/private/IntegrityCheck/Checker.php
View file @
dbd176cf
...
...
@@ -108,7 +108,11 @@ class Checker {
* applicable for very specific scenarios and we should not advertise it
* too prominent. So please do not add it to config.sample.php.
*/
$isIntegrityCheckDisabled
=
$this
->
config
->
getSystemValue
(
'integrity.check.disabled'
,
false
);
if
(
$this
->
config
!==
null
)
{
$isIntegrityCheckDisabled
=
$this
->
config
->
getSystemValue
(
'integrity.check.disabled'
,
false
);
}
else
{
$isIntegrityCheckDisabled
=
false
;
}
if
(
$isIntegrityCheckDisabled
===
true
)
{
return
false
;
}
...
...
@@ -401,7 +405,10 @@ class Checker {
return
json_decode
(
$cachedResults
,
true
);
}
return
json_decode
(
$this
->
config
->
getAppValue
(
'core'
,
self
::
CACHE_KEY
,
'{}'
),
true
);
if
(
$this
->
config
!==
null
)
{
return
json_decode
(
$this
->
config
->
getAppValue
(
'core'
,
self
::
CACHE_KEY
,
'{}'
),
true
);
}
return
[];
}
/**
...
...
@@ -416,7 +423,9 @@ class Checker {
if
(
!
empty
(
$result
))
{
$resultArray
[
$scope
]
=
$result
;
}
$this
->
config
->
setAppValue
(
'core'
,
self
::
CACHE_KEY
,
json_encode
(
$resultArray
));
if
(
$this
->
config
!==
null
)
{
$this
->
config
->
setAppValue
(
'core'
,
self
::
CACHE_KEY
,
json_encode
(
$resultArray
));
}
$this
->
cache
->
set
(
self
::
CACHE_KEY
,
json_encode
(
$resultArray
));
}
...
...
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