Merge branch '2.1.x'

Conflicts:
	tests/unit/event/listener_test.php
This commit is contained in:
Marc Alexander
2015-06-24 16:06:50 +02:00
23 changed files with 830 additions and 109 deletions

View File

@@ -7,10 +7,12 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/utf/utf_tools.php');
require_once(dirname(__FILE__) . '/../../../vendor/nickvergessen/phpbb-tool-trimmessage/src/Nickvergessen/TrimMessage/TrimMessage.php');
require_once(dirname(__FILE__) . '/../../../vendor/nickvergessen/phpbb-tool-trimmessage/src/Nickvergessen/TrimMessage/PhpbbBbcodes.php');
class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\database_test_case
{