Fix unit test

application/ApplicationUtils.php

@@ -149,7 +149,8 @@ class ApplicationUtils
             'application',
             'inc',
             'plugins',
-            'tpl/'.$conf->get('resource.theme'),
+            $conf->get('resource.raintpl_tpl'),
+            $conf->get('resource.raintpl_tpl').'/'.$conf->get('resource.theme'),
         ) as $path) {
             if (! is_readable(realpath($path))) {
                 $errors[] = '"'.$path.'" directory is not readable';

tests/ApplicationUtilsTest.php

@@ -288,7 +288,8 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
         $conf->set('resource.log', 'data/log.txt');
         $conf->set('resource.page_cache', 'pagecache');
         $conf->set('resource.raintpl_tmp', 'tmp');
-        $conf->set('resource.theme', 'tpl');
+        $conf->set('resource.raintpl_tpl', 'tpl');
+        $conf->set('resource.theme', 'default');
         $conf->set('resource.update_check', 'data/lastupdatecheck.txt');
 
         $this->assertEquals(
@@ -311,11 +312,13 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
         $conf->set('resource.log', 'null/data/log.txt');
         $conf->set('resource.page_cache', 'null/pagecache');
         $conf->set('resource.raintpl_tmp', 'null/tmp');
-        $conf->set('resource.theme', 'null/tpl');
+        $conf->set('resource.raintpl_tpl', 'null/tpl');
+        $conf->set('resource.raintpl_theme', 'null/tpl/default');
         $conf->set('resource.update_check', 'null/data/lastupdatecheck.txt');
         $this->assertEquals(
             array(
                 '"null/tpl" directory is not readable',
+                '"null/tpl/default" directory is not readable',
                 '"null/cache" directory is not readable',
                 '"null/cache" directory is not writable',
                 '"null/data" directory is not readable',