diff options
author | Andy Staudacher <andy.st@gmail.com> | 2009-08-30 18:27:40 -0700 |
---|---|---|
committer | Andy Staudacher <andy.st@gmail.com> | 2009-08-30 18:27:40 -0700 |
commit | e7f5e0a9a3a19d535a69e19c4527800096ae1aaa (patch) | |
tree | 15662d3291b18ae0aefa6b2cea04d2f2fcf54740 /installer/web.php | |
parent | df38a890a64dd33eafe3aed51ce8fde732cf8b8b (diff) | |
parent | 31dcdcc6ad6ce47c03265f3d6e499774a17ff727 (diff) |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/views/l10n_client.html.php
modules/organize/views/organize_tree.html.php
modules/server_add/helpers/server_add_event.php
Diffstat (limited to 'installer/web.php')
-rw-r--r-- | installer/web.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/web.php b/installer/web.php index aceb5368..eb0211a6 100644 --- a/installer/web.php +++ b/installer/web.php @@ -41,7 +41,7 @@ if (installer::already_installed()) { if (!installer::connect($config)) { $content = render("invalid_db_info.html.php"); - } else if (!installer::verify_version($config)) { + } 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"); |