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

3 files changed, 5 insertions, 4 deletions

diff --git a/installer/install.sql b/installer/install.sql
index dea324eb..ebe3651d 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -42,6 +42,7 @@ CREATE TABLE {caches} (
   `expiration` int(9) NOT NULL,
   `cache` longblob,
   PRIMARY KEY  (`id`),
+  KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
@@ -239,7 +240,7 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',28);
+INSERT INTO {modules} VALUES (1,1,'gallery',30);
 INSERT INTO {modules} VALUES (2,1,'user',3);
 INSERT INTO {modules} VALUES (3,1,'comment',2);
 INSERT INTO {modules} VALUES (4,1,'organize',1);
@@ -389,7 +390,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','image_quality','75');
 INSERT INTO {vars} VALUES (NULL,'gallery','image_sharpen','15');
 INSERT INTO {vars} VALUES (NULL,'gallery','time_format','H:i:s');
 INSERT INTO {vars} VALUES (NULL,'gallery','show_credits','1');
-INSERT INTO {vars} VALUES (NULL,'gallery','credits','Powered by <a href=\"%url\">Gallery %version</a>');
+INSERT INTO {vars} VALUES (NULL,'gallery','credits','Powered by <a href=\"%url\">%gallery_version</a>');
 INSERT INTO {vars} VALUES (NULL,'gallery','simultaneous_upload_limit','5');
 INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
diff --git a/installer/installer.php b/installer/installer.php
index 57be6cc0..705f1725 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -77,7 +77,7 @@ class installer {
     // counterparts.
     if (!function_exists("mysql_query")) {
       function mysql_connect($host, $user, $pass) {
-        list ($host, $port) = explode(":", $host);
+        list ($host, $port) = explode(":", $host . ":");
         installer::$mysqli = new mysqli($host, $user, $pass, $port);
         // http://php.net/manual/en/mysqli.connect.php says to use mysqli_connect_error() instead of
         // $mysqli->connect_error because of bugs before PHP 5.2.9
diff --git a/installer/web.php b/installer/web.php
index 90143afb..0a3cdb6e 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -38,7 +38,7 @@ if (installer::already_installed()) {
                     "dbname" => $_POST["dbname"],
                     "prefix" => $_POST["prefix"],
                     "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
-    list ($config["host"], $config["port"]) = explode(":", $config["host"]);
+    list ($config["host"], $config["port"]) = explode(":", $config["host"] . ":");
 
     if (!installer::connect($config)) {
       $content = render("invalid_db_info.html.php");