diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-19 21:43:23 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-19 21:43:23 -0400 |
| commit | 248559d7d10e0d347e139469b5e5a9774e65c11e (patch) | |
| tree | 2c36c846000dfbfcf697a7f3da659ca3069e2c0c /phpBB/includes | |
| parent | 7fc4a184c27e3977ef80da17729d9c510b74d43f (diff) | |
| parent | 8bb083eed91f049600ff0db4d8528e7a6c7e5093 (diff) | |
| download | forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar.gz forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar.bz2 forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar.xz forums-248559d7d10e0d347e139469b5e5a9774e65c11e.zip | |
Merge PR #734 branch 'shibulijack/ticket/10688' into develop
* shibulijack/ticket/10688:
[ticket/10688] Update install.html for 3.1 and current practices.
[ticket/10688] Update readme for 3.1 and current practices.
[ticket/10688] Changed version 3.0 to 3.1
[ticket/10688] Updated version to 3.1
[ticket/10688] Changed 3.0 to 3.1 in docs
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_install.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a13605f688..28f06abbc1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -343,7 +343,7 @@ function still_on_time($extra_time = 15) /** * -* @version Version 0.1 / slightly modified for phpBB 3.0.x (using $H$ as hash type identifier) +* @version Version 0.1 / slightly modified for phpBB 3.1.x (using $H$ as hash type identifier) * * Portable PHP password hashing framework. * diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index a49e19f09a..c1250bac27 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -516,7 +516,7 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = $load_extensions = implode(',', $load_extensions); $config_data = "<?php\n"; - $config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n"; + $config_data .= "// phpBB 3.1.x auto-generated configuration file\n// Do not change anything in this file!\n"; $config_data_array = array( 'dbms' => $dbms, |