3 files changed, 40 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js
index 4640d03de7..da30f136bd 100644
--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@@ -52,7 +52,7 @@
 
             if (messages[i].hasOwnProperty('description')) {
                 $description = $(document.createElement('p'));
-                $description.text(messages[i].description);
+                $description.html(messages[i].description);
                 $msgElement.append($description);
             }
 
@@ -69,6 +69,10 @@
                     $msgElement.addClass('log');
                     $logContainer.append($msgElement);
                     break;
+                case 'success':
+                    $msgElement.addClass('successbox');
+                    $errorContainer.prepend($msgElement);
+                    break;
             }
         }
     }
@@ -201,6 +205,10 @@
             addMessage('log', responseObject.logs);
         }
 
+        if (responseObject.hasOwnProperty('success')) {
+            addMessage('success', responseObject.success);
+        }
+
         if (responseObject.hasOwnProperty('form')) {
             addForm(responseObject.form);
         }
diff --git a/phpBB/language/en/install_new.php b/phpBB/language/en/install_new.php
index 607565fcd0..923601b110 100644
--- a/phpBB/language/en/install_new.php
+++ b/phpBB/language/en/install_new.php
@@ -80,6 +80,8 @@ $lang = array_merge($lang, array(
 	</ul>
 
 	<p>Only those databases supported on your server will be displayed.',
+
+	'ACP_LINK'	=> 'Take me to <a href="%1$s">the ACP</a>',
 ));
 
 // Requirements translation
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index 0e19129247..cb4ddb8783 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -18,6 +18,7 @@ use phpbb\install\exception\installer_config_not_writable_exception;
 use phpbb\install\exception\resource_limit_reached_exception;
 use phpbb\install\exception\user_interaction_required_exception;
 use phpbb\install\helper\config;
+use phpbb\install\helper\iohandler\cli_iohandler;
 use phpbb\install\helper\iohandler\iohandler_interface;
 
 class installer
@@ -171,6 +172,34 @@ class installer
 
 			// Installation finished
 			$install_finished = true;
+
+			if ($this->iohandler instanceof cli_iohandler)
+			{
+				$this->iohandler->add_success_message('INSTALLER_FINISHED');
+			}
+			else
+			{
+				global $SID;
+
+				// Construct ACP url
+				$acp_url = $protocol = $this->install_config->get('server_protocol');
+				$acp_url .= $this->install_config->get('server_name');
+				$port = $this->install_config->get('server_port');
+
+				if (!((strpos($protocol, 'https:') === 0 && $port === 443)
+					|| (strpos($protocol, 'http:') === 0 && $port === 80)))
+				{
+					$acp_url .= ':' . $port;
+				}
+
+				$acp_url .= $this->install_config->get('script_path');
+				$acp_url .= '/adm/index.php' . $SID;
+
+				$this->iohandler->add_success_message('INSTALLER_FINISHED', array(
+					'ACP_LINK',
+					$acp_url,
+				));
+			}
 		}
 		catch (user_interaction_required_exception $e)
 		{