diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-21 09:34:26 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-21 09:34:26 +0200 |
| commit | b802732167959e409fd87f9c4c4da5b4a427c865 (patch) | |
| tree | 9625be4652b536700872101e7e0967eb3380335c /tests/template | |
| parent | 6c98b01ad1216f89695dbf2cc59d985e53544751 (diff) | |
| parent | 5f905f67ee79093a217f6ffbe1143386851b843d (diff) | |
| download | forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar.gz forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar.bz2 forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar.xz forums-b802732167959e409fd87f9c4c4da5b4a427c865.zip | |
Merge branch 'ticket/14099' into 3.1.x
* ticket/14099:
[ticket/14099] Fix the assets
[ticket/14099] Make composer.phar executable again
[ticket/14099] Fix tests
[ticket/14099] Update twig/twig to 1.20.0
[ticket/14099] Update composer.phar
Diffstat (limited to 'tests/template')
| -rw-r--r-- | tests/template/template_includecss_test.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index 4ef9b90ec4..b025cd21d5 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -55,13 +55,6 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te public function template_data() { - $url_base = explode('/', dirname(__FILE__)); - foreach ($url_base as &$dir) - { - $dir = rawurlencode($dir); - } - $url_base = implode('/', $url_base); - return array( /* array( @@ -79,11 +72,11 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te ), array( array('TEST' => 3), - '<link href="' . $url_base . '/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />', + '<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />', ), array( array('TEST' => 4), - '<link href="' . $url_base . '/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />', + '<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />', ), ); } |