aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-02-04 01:07:30 +0000
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-02-04 01:07:30 +0000
commit4a17abbcc4950cef434e579c8fa68cc32bf8c284 (patch)
tree65747b8e6a64d3b2d9650cc30433a16d6185ac7c /phpBB/install
parentdec3e2f728bb5fb344c0098b6a8b909495d2d662 (diff)
downloadforums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar
forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar.gz
forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar.bz2
forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar.xz
forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.zip
Merge r10473 into the 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 5a6603883b..1d6b79bbec 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -32,7 +32,7 @@ unset($dbpasswd);
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3',
- 'phpbb_version' => '3.0.6',
+ 'phpbb_version' => '3.0.7',
'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms,
'dbhost' => $dbhost,
@@ -78,6 +78,15 @@ $tables = array(
*
* 'table_format' can take the value 'file' to indicate a config file. In this case array_name
* is set to indicate the name of the array the config values are stored in
+* Example of using a file:
+* $config_schema = array(
+* 'table_format' => 'file',
+* 'filename' => 'NAME OF FILE', // If the file is not in the root directory, the path needs to be added with no leading slash
+* 'array_name' => 'NAME OF ARRAY', // Only used if the configuration file stores the setting in an array.
+* 'settings' => array(
+* 'board_email' => 'SUPPORT_EMAIL', // target config name => source target name
+* )
+* );
* 'table_format' can be an array if the values are stored in a table which is an assosciative array
* (as per phpBB 2.0.x)
* If left empty, values are assumed to be stored in a table where each config setting is