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 #4990 from rubencm/ticket/15377

Browse source 
[ticket/15377] Fix INCLUDECSS and INCLUDEJS
This commit is contained in:
Máté Bartus 2017-10-09 21:12:08 +02:00 • committed by GitHub
commit 68b3da2df0
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/template/twig/loader.php
View file

@ -22,6 +22,16 @@ class loader extends \Twig_Loader_Filesystem
{ {
protected $safe_directories = array(); protected $safe_directories = array();
/**
* Constructor
*
* @param string|array $paths
*/
public function __construct($paths = array())
{
parent::__construct($paths, __DIR__);
}
/** /**
* Set safe directories * Set safe directories
* *

9
tests/functional/extension_controller_test.php
View file

@ -89,6 +89,15 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
$this->phpbb_extension_manager->purge('foo/bar'); $this->phpbb_extension_manager->purge('foo/bar');
} }
/**
* Check includejs/includecss when the request_uri is a subdirectory
*/
public function test_controller_template_include_js_css()
{
$crawler = self::request('GET', 'app.php/help/faq');
$this->assertContains("./../../assets/javascript/core.js", $crawler->filter('body')->html());
}
/** /**
* Check the error produced by calling a controller without a required * Check the error produced by calling a controller without a required
* argument. * argument.