projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #11036 from elisseck/CRM-20460-4.7
[civicrm-core.git]
/
install
/
index.php
diff --git
a/install/index.php
b/install/index.php
index f6c2740a358c7d5c4c3fdf2b0c9efb5e50f8fd34..778899163a3dbf0206c4323d5c5efd45b76d0377 100644
(file)
--- a/
install/index.php
+++ b/
install/index.php
@@
-570,7
+570,7
@@
class InstallRequirements {
$host = implode(':', $hostParts);
}
else {
$host = implode(':', $hostParts);
}
else {
- $port =
''
;
+ $port =
NULL
;
}
$conn = @mysqli_connect($host, $username, $password, $database, $port);
return $conn;
}
$conn = @mysqli_connect($host, $username, $password, $database, $port);
return $conn;
@@
-705,6
+705,13
@@
class InstallRequirements {
ts("MySQL support not included in PHP."),
));
ts("MySQL support not included in PHP."),
));
+ // Check for XML support
+ $this->requireFunction('simplexml_load_file', array(
+ ts("PHP Configuration"),
+ ts("SimpleXML support"),
+ ts("SimpleXML support not included in PHP."),
+ ));
+
// Check for JSON support
$this->requireFunction('json_encode', array(
ts("PHP Configuration"),
// Check for JSON support
$this->requireFunction('json_encode', array(
ts("PHP Configuration"),