Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 6 insertions, 0 deletions

diff --git a/installer/web.php b/installer/web.php
index 78784539..eb0211a6 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -41,6 +41,8 @@ if (installer::already_installed()) {
 
     if (!installer::connect($config)) {
       $content = render("invalid_db_info.html.php");
+    } else if (!installer::verify_mysql_version($config)) {
+      $content = render("invalid_db_version.html.php");
     } else if (!installer::select_db($config)) {
       $content = render("missing_db.html.php");
     } else if (!installer::db_empty($config)) {
@@ -104,6 +106,10 @@ function check_environment() {
     $errors[] = "PHP is missing the <a href=\"http://php.net/iconv\">iconv extension</a>";
   }
 
+  if (!(extension_loaded("simplexml"))) {
+    $errors[] = "PHP is missing the <a href=\"http://php.net/simplexml\">SimpleXML extension</a>";
+  }
+
   if (extension_loaded("mbstring") && (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING)) {
     $errors[] = "The <a href=\"http://php.net/mbstring\">mbstring extension</a> is overloading PHP's native string functions.  Please disable it.";
   }