mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html
This commit is contained in:
Igor Wiedler
2011-01-07 01:39:18 +01:00
parent da4617b14b 5b752a2fed
commit 14a84cf89c
47 changed files with 128 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/template/templates/_dummy_include.php
View File

@@ -1,3 +0,0 @@
<?php
echo "testing included php";

3
tests/template/templates/_dummy_include.php.inc Normal file
View File

@@ -0,0 +1,3 @@
<?php
// extension is .php.inc so PHPUnit ignores it
echo "testing included php";

2
tests/template/templates/includephp.html
View File

@@ -1 +1 @@
<!-- INCLUDEPHP _dummy_include.php -->
<!-- INCLUDEPHP ../templates/_dummy_include.php.inc -->