mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #628 from nextcloud/stable10-backport-612 

[stable10] libxml - compare against loaded version
This commit is contained in:
Morris Jobke 2016-07-28 16:56:55 +02:00 committed by GitHub
parent b1830b74fe 1913419520
commit 0a14cd4d60
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/legacy/util.php
View File

@ -833,9 +833,15 @@ class OC_Util {
} }
if(function_exists('xml_parser_create') && 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( $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.') 'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
); );
} }