diff options
Diffstat (limited to 'lib/private/Template')
| -rw-r--r-- | lib/private/Template/JSConfigHelper.php | 2 | ||||
| -rw-r--r-- | lib/private/Template/JSResourceLocator.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index 781cb0d7794..24573d71fe0 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -121,7 +121,7 @@ class JSConfigHelper { $backend = $this->currentUser->getBackend(); if ($backend instanceof IPasswordConfirmationBackend) { $userBackendAllowsPasswordConfirmation = $backend->canConfirmPassword($uid); - } else if (isset($this->excludedUserBackEnds[$this->currentUser->getBackendClassName()])) { + } elseif (isset($this->excludedUserBackEnds[$this->currentUser->getBackendClassName()])) { $userBackendAllowsPasswordConfirmation = false; } } else { diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index 93fbbf7d55d..0b6cf4e306e 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -62,7 +62,7 @@ class JSResourceLocator extends ResourceLocator { if ($found) { return; } - } else if ($this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js') + } elseif ($this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js') || $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js') || $this->appendIfExist($this->serverroot, $script.'.js') || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json') |