Merge commit 'upstream/master'

Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php

1 files changed, 7 insertions, 0 deletions

diff --git a/installer/installer.php b/installer/installer.php
index b0af561e..456cffaa 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -104,6 +104,13 @@ class installer {
       mysql_select_db($config["dbname"]);
   }
 
+  static function verify_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", ">=");
+  }
+
   static function db_empty($config) {
     $query = "SHOW TABLES IN {$config['dbname']} LIKE '{$config['prefix']}items'";
     return mysql_num_rows(mysql_query($query)) == 0;