makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5356 from rubencm/ticket/15772

Browse source 
[ticket/15772] Hide warning in acp when allow_install_dir is true
This commit is contained in:
Marc Alexander 2018-09-22 12:55:30 +02:00 • committed by GitHub
commit 4fbf1a5b5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_main.php
View file

@ -639,7 +639,7 @@ class acp_main
} }
// Warn if install is still present // Warn if install is still present
if (file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install')) if (!defined('IN_INSTALL') && !$phpbb_container->getParameter('allow_install_dir') && file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install'))
{ {
$template->assign_var('S_REMOVE_INSTALL', true); $template->assign_var('S_REMOVE_INSTALL', true);
} }

2
tests/test_framework/phpbb_ui_test_case.php
View file

@ -210,6 +210,8 @@ class phpbb_ui_test_case extends phpbb_test_case
$container->register('installer.install_finish.notify_user')->setSynthetic(true); $container->register('installer.install_finish.notify_user')->setSynthetic(true);
$container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task()); $container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task());
$container->register('installer.install_finish.install_extensions')->setSynthetic(true);
$container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task());
$container->compile(); $container->compile();
$language = $container->get('language'); $language = $container->get('language');