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

1 files changed, 6 insertions, 4 deletions

diff --git a/installer/installer.php b/installer/installer.php
index 456cffaa..50657d80 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -104,11 +104,13 @@ class installer {
       mysql_select_db($config["dbname"]);
   }
 
-  static function verify_version($config) {
+  static function verify_mysql_version($config) {
+    return version_compare(installer::mysql_version($config), "5.0.0", ">=");
+  }
+
+  static function mysql_version($config) {
     $result = mysql_query("SHOW VARIABLES WHERE variable_name = \"version\"");
-    $row = mysql_fetch_object($result);
-    $version = substr($row->Value, 0, strpos($row->Value, "-"));
-    return version_compare($version, "5.0.0", ">=");
+    return $row->Value;
   }
 
   static function db_empty($config) {