Skip to content

Commit

Permalink
Merge pull request #628 from nextcloud/stable10-backport-612
Browse files Browse the repository at this point in the history
[stable10] libxml - compare against loaded version
  • Loading branch information
MorrisJobke authored Jul 28, 2016
2 parents b1830b7 + 1913419 commit 0a14cd4
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lib/private/legacy/util.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
);
}
Expand Down

0 comments on commit 0a14cd4

Please sign in to comment.