mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 13:28:55 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10354] Include cache directory path in unwritable message. Conflicts: tests/template/template_test.php
This commit is contained in:
commit
bbb10f576f
1 changed files with 3 additions and 2 deletions
|
@ -66,9 +66,10 @@ class phpbb_template_template_test_case extends phpbb_test_case
|
|||
// Test the engine can be used
|
||||
$this->setup_engine();
|
||||
|
||||
if (!is_writable(dirname($this->template->cachepath)))
|
||||
$template_cache_dir = dirname($this->template->cachepath);
|
||||
if (!is_writable($template_cache_dir))
|
||||
{
|
||||
$this->markTestSkipped("Template cache directory is not writable.");
|
||||
$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable.");
|
||||
}
|
||||
|
||||
foreach (glob($this->template->cachepath . '*') as $file)
|
||||
|
|
Loading…
Add table
Reference in a new issue