diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-27 17:33:22 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-07-28 08:30:33 +0200 |
| commit | 740349fda3273409b35b94c8f105a1e65d8bc1fc (patch) | |
| tree | a98579f75e83225403c105aef7e234d8885578bc /lib/private/legacy | |
| parent | a61736c0dda39c197072d1b3fa63ec356d62cacb (diff) | |
| download | nextcloud-server-740349fda3273409b35b94c8f105a1e65d8bc1fc.tar.gz nextcloud-server-740349fda3273409b35b94c8f105a1e65d8bc1fc.zip | |
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
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/util.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index f3a79311a18..83274f82792 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -833,9 +833,15 @@ class OC_Util { } 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.') ); } |