diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-07-05 22:22:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 22:22:14 +0200 |
| commit | acdb08b674b6240a1d112c9849400dae64b9bc90 (patch) | |
| tree | a59063094e1cc43a7fa86a6eb799e93ad449f313 | |
| parent | 661f608bd235f25a317b79622b0644e7a067f8a7 (diff) | |
| parent | ec7c8e8cc16cfc29773c8aa918a0f0a59bbad716 (diff) | |
| download | nextcloud-server-acdb08b674b6240a1d112c9849400dae64b9bc90.tar.gz nextcloud-server-acdb08b674b6240a1d112c9849400dae64b9bc90.zip | |
Merge pull request #33024 from nextcloud/backport/29862/stable23
[stable23] Avoid deprecation warnings about libxml_disable_entity_loader in PHP 8+
| -rw-r--r-- | lib/private/Updater/ChangesCheck.php | 10 | ||||
| -rw-r--r-- | lib/private/Updater/VersionCheck.php | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lib/private/Updater/ChangesCheck.php b/lib/private/Updater/ChangesCheck.php index 600c8db9a3c..e3ced6e5b12 100644 --- a/lib/private/Updater/ChangesCheck.php +++ b/lib/private/Updater/ChangesCheck.php @@ -138,9 +138,13 @@ class ChangesCheck { protected function extractData($body):array { $data = []; if ($body) { - $loadEntities = libxml_disable_entity_loader(true); - $xml = @simplexml_load_string($body); - libxml_disable_entity_loader($loadEntities); + if (\LIBXML_VERSION < 20900) { + $loadEntities = libxml_disable_entity_loader(true); + $xml = @simplexml_load_string($body); + libxml_disable_entity_loader($loadEntities); + } else { + $xml = @simplexml_load_string($body); + } if ($xml !== false) { $data['changelogURL'] = (string)$xml->changelog['href']; $data['whatsNew'] = []; diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index ffa707d8990..d9f795796b8 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -95,9 +95,13 @@ class VersionCheck { } if ($xml) { - $loadEntities = libxml_disable_entity_loader(true); - $data = @simplexml_load_string($xml); - libxml_disable_entity_loader($loadEntities); + if (\LIBXML_VERSION < 20900) { + $loadEntities = libxml_disable_entity_loader(true); + $data = @simplexml_load_string($xml); + libxml_disable_entity_loader($loadEntities); + } else { + $data = @simplexml_load_string($xml); + } if ($data !== false) { $tmp['version'] = (string)$data->version; $tmp['versionstring'] = (string)$data->versionstring; |