mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:17:58 +02:00
Code Issues Releases Wiki Activity

[feature/twig] Fix includephp_from_subdir_test.php

Browse Source 
PHPBB3-11598
This commit is contained in:
Nathaniel Guse
2013-07-01 13:06:37 -05:00
parent 341bae40eb
commit 6f925552a5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/template/subdir/includephp_from_subdir_test.php
View File

@ -19,9 +19,7 @@ class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_t
{
$this->setup_engine(array('tpl_allow_php' => true));
$cache_file = $this->template->cachepath . 'includephp_relative.html.php';
$this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php", $cache_file);
$this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php");
$this->template->set_filenames(array('test' => 'includephp_relative.html'));
$this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP");

8
tests/template/template_test_case.php
View File

@ -105,9 +105,13 @@ class phpbb_template_template_test_case extends phpbb_test_case
$this->template->destroy_block_vars($block);
}
foreach ($lang_vars as $name => $value)
// Previous functionality was $cachefile (string), which was removed, check to prevent errors
if (is_array($lang_vars))
{
$this->user->lang[$name] = $value;
foreach ($lang_vars as $name => $value)
{
$this->user->lang[$name] = $value;
}
}
$expected = str_replace(array("\n", "\r", "\t"), '', $expected);