Skip to content

[stable9] libxml - compare against loaded version #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2016
Merged

[stable9] libxml - compare against loaded version #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/private/util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,9 +831,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]),
Copy link
Member

@rullzer rullzer Jul 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... currently loaded

'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
);
}
Expand Down