1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 15:11:40 +02: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:
Igor Wiedler
2011-09-05 09:20:06 +02:00

View File

@@ -66,9 +66,10 @@ class phpbb_template_template_test_case extends phpbb_test_case
// Test the engine can be used // Test the engine can be used
$this->setup_engine(); $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) foreach (glob($this->template->cachepath . '*') as $file)