mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 08:05:25 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6482 from marc1706/ticket/15129

Browse Source 
[ticket/15129] Ensure link to installation guide is correct
This commit is contained in:
Marc Alexander 2023-05-16 20:46:34 +02:00
commit 3cde5974d2
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/config/installer/container/services_install_controller.yml
View File

@ -4,6 +4,7 @@ services:
arguments:
- '@phpbb.installer.controller.helper'
- '@language'
- '@path_helper'
- '@template'
- '%core.root_path%'

2
phpBB/language/en/install.php
View File

@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
// Introduction page
'INTRODUCTION_TITLE' => 'Introduction',
'INTRODUCTION_BODY' => 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
'INTRODUCTION_BODY' => 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="%1$s">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
// Support page
'SUPPORT_TITLE' => 'Support',

12
phpBB/phpbb/install/controller/installer_index.php
View File

@ -13,6 +13,8 @@
namespace phpbb\install\controller;
use phpbb\path_helper;
class installer_index
{
/**
@ -25,6 +27,9 @@ class installer_index
*/
protected $language;
/** @var path_helper */
protected $path_helper;
/**
* @var \phpbb\template\template
*/
@ -40,13 +45,15 @@ class installer_index
*
* @param helper $helper
* @param \phpbb\language\language $language
* @param path_helper $path_helper
* @param \phpbb\template\template $template
* @param string $phpbb_root_path
*/
public function __construct(helper $helper, \phpbb\language\language $language, \phpbb\template\template $template, $phpbb_root_path)
public function __construct(helper $helper, \phpbb\language\language $language, path_helper $path_helper, \phpbb\template\template $template, $phpbb_root_path)
{
$this->helper = $helper;
$this->language = $language;
$this->path_helper = $path_helper;
$this->template = $template;
$this->phpbb_root_path = $phpbb_root_path;
}
@ -59,7 +66,8 @@ class installer_index
{
case "intro":
$title = $this->language->lang('INTRODUCTION_TITLE');
$body = $this->language->lang('INTRODUCTION_BODY');
$install_docs_path = $this->path_helper->update_web_root_path($this->phpbb_root_path . 'docs/INSTALL.html');
$body = $this->language->lang('INTRODUCTION_BODY', $install_docs_path);
break;
case "support":
$title = $this->language->lang('SUPPORT_TITLE');