From e7804ecce4511d8befdcc28f6705c3589c47c878 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 27 Jun 2014 21:02:20 +0200
Subject: [ticket/12775] Update phpBB/install/database_update.php

PHPBB3-12775
---
 phpBB/phpbb/config_php.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/config_php.php')

diff --git a/phpBB/phpbb/config_php.php b/phpBB/phpbb/config_php.php
index d502088897..31a84662fa 100644
--- a/phpBB/phpbb/config_php.php
+++ b/phpBB/phpbb/config_php.php
@@ -35,6 +35,13 @@ class config_php
 	*/
 	protected $config_data = array();
 
+	/**
+	* The path to the config file. (Defaults: $phpbb_root_path . 'config.' . $php_ext)
+	*
+	* @var string
+	*/
+	protected $config_file;
+
 	/**
 	* Constructor
 	*
@@ -45,6 +52,18 @@ class config_php
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
+		$this->config_file = $this->phpbb_root_path . 'config.' . $this->php_ext;
+	}
+
+	/**
+	* Set the path to the config file.
+	*
+	* @param string $config_file
+	*/
+	public function set_config_file($config_file)
+	{
+		$this->config_file = $config_file;
+		$this->config_loaded = false;
 	}
 
 	/**
@@ -87,12 +106,12 @@ class config_php
 	{
 		if (!$this->config_loaded)
 		{
-			if (file_exists($this->phpbb_root_path . 'config.' . $this->php_ext))
+			if (file_exists($this->config_file))
 			{
 				$defined_vars = null;
 				$defined_vars = get_defined_vars();
 
-				require($this->phpbb_root_path . 'config.' . $this->php_ext);
+				require($this->config_file);
 				$this->config_data = array_diff_key(get_defined_vars(), $defined_vars);
 
 				$this->config_loaded = true;
-- 
cgit v1.2.1