From 740349fda3273409b35b94c8f105a1e65d8bc1fc Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 27 Jul 2016 17:33:22 +0200 Subject: [PATCH] libxml - compare against loaded version * if the compiled in version is older than the loaded version Nextcloud doesn't work * uses the loaded libxml version to check against fixes #205 --- lib/private/legacy/util.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index f3a79311a186d..83274f8279296 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -833,9 +833,15 @@ public static function checkServer(\OCP\IConfig $config) { } if(function_exists('xml_parser_create') && - version_compare('2.7.0', LIBXML_DOTTED_VERSION) === 1) { + LIBXML_LOADED_VERSION < 20700 ) { + $version = LIBXML_LOADED_VERSION; + $major = floor($version/10000); + $version -= ($major * 10000); + $minor = floor($version/100); + $version -= ($minor * 100); + $patch = $version; $errors[] = array( - 'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [LIBXML_DOTTED_VERSION]), + 'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]), 'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.') ); }