sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11042 from nextcloud/bugfix/10894/php73-filter_var-deprecation 

Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894
pull/11208/head
Joas Schilling 2018-09-13 09:31:41 +07:00 committed by GitHub
parent a1c969a170 8f9fa9ee13
commit 480783a630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/oauth2/lib/Controller/SettingsController.php
Unescape Escape View File

@ -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);
}

6
apps/theming/lib/ThemingDefaults.php
Unescape Escape View File

@ -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
*/