diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 23:34:34 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 23:34:34 -0500 |
| commit | f723491527f7f50b8f85d6385696992916468511 (patch) | |
| tree | 23e711d8927789dd33f7f4676286bf38c217c2de /phpBB/install/schemas/schema_data.sql | |
| parent | 0a7508439f20b358f1e51d3f2d8105903588e430 (diff) | |
| parent | f22b959257deba0f00a4330df9103c47673032b8 (diff) | |
| download | forums-f723491527f7f50b8f85d6385696992916468511.tar forums-f723491527f7f50b8f85d6385696992916468511.tar.gz forums-f723491527f7f50b8f85d6385696992916468511.tar.bz2 forums-f723491527f7f50b8f85d6385696992916468511.tar.xz forums-f723491527f7f50b8f85d6385696992916468511.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373
# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
[ticket/11745] Correct language, coding guidelines
[ticket/11828] Fix greedy operators in lexer
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[ticket/develop/11832] Fix path detection
[ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
[ticket/11833] Fix bad template loop
[feature/oauth] Fix tabindex
[ticket/11816] !$DOESNT_EXIST test
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
[ticket/11829] Use report_closed to determine status in MCP report_details
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[feature/oauth] Fix bug on ucp_auth_link related to error display
...
Diffstat (limited to 'phpBB/install/schemas/schema_data.sql')
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index d03fdf9de4..0a31b89aab 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -170,7 +170,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_search_load' INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_anon_lastread', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_birthdays', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_profile', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_pm', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1'); |