diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2018-09-17 10:10:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 10:10:54 +0200 |
| commit | fb9379db3efa204378682bc77049f4153934dc81 (patch) | |
| tree | 2a86d382e480b03614db8a2026157ede8a3dcbc7 | |
| parent | 5bf377463e760e0ce091c19d4bf226a497a91038 (diff) | |
| parent | 5058333445442a3e12e65d611fe6f23ac15d3194 (diff) | |
| download | nextcloud-server-fb9379db3efa204378682bc77049f4153934dc81.tar.gz nextcloud-server-fb9379db3efa204378682bc77049f4153934dc81.zip | |
Merge pull request #11237 from nextcloud/backport/11042/stable14
[stable14] Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894
| -rw-r--r-- | apps/oauth2/lib/Controller/SettingsController.php | 2 | ||||
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/apps/oauth2/lib/Controller/SettingsController.php b/apps/oauth2/lib/Controller/SettingsController.php index 499969b93bb..ecf3179e1bc 100644 --- a/apps/oauth2/lib/Controller/SettingsController.php +++ b/apps/oauth2/lib/Controller/SettingsController.php @@ -74,7 +74,7 @@ class SettingsController extends Controller { public function addClient(string $name, string $redirectUri): JSONResponse { - if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED|FILTER_FLAG_HOST_REQUIRED) === false) { + if (filter_var($redirectUri, FILTER_VALIDATE_URL) === false) { return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST); } diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index fe1b1d4c17f..1df7a9f17bb 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -174,9 +174,7 @@ class ThemingDefaults extends \OC_Defaults { $legalLinks = ''; $divider = ''; foreach($links as $link) { if($link['url'] !== '' - && filter_var($link['url'], FILTER_VALIDATE_URL, [ - 'flags' => FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED - ]) + && filter_var($link['url'], FILTER_VALIDATE_URL) ) { $legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' . ' rel="noreferrer noopener">' . $link['text'] . '</a>'; @@ -339,7 +337,7 @@ class ThemingDefaults extends \OC_Defaults { } return false; } - + /** * Increases the cache buster key */ |