diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-08 23:10:42 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-08 23:10:42 +0200 |
| commit | 527f02bb4b7e023c822fa2fe648784a77d7b9cc9 (patch) | |
| tree | 10f7d21af120c6a8efb7b304e88cd6a1a2adddfe /tests/text_processing | |
| parent | 576cd6dd1e45171e998d6aa13ab74b73939ce084 (diff) | |
| parent | 088dbc0b54ab4798e2ec4c0466189f3d7e8256ed (diff) | |
| download | forums-527f02bb4b7e023c822fa2fe648784a77d7b9cc9.tar forums-527f02bb4b7e023c822fa2fe648784a77d7b9cc9.tar.gz forums-527f02bb4b7e023c822fa2fe648784a77d7b9cc9.tar.bz2 forums-527f02bb4b7e023c822fa2fe648784a77d7b9cc9.tar.xz forums-527f02bb4b7e023c822fa2fe648784a77d7b9cc9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
Conflicts:
tests/bbcode/url_bbcode_test.php
Diffstat (limited to 'tests/text_processing')
| -rw-r--r-- | tests/text_processing/censor_text_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php index 8fcdb7ef85..f0e13638a5 100644 --- a/tests/text_processing/censor_text_test.php +++ b/tests/text_processing/censor_text_test.php @@ -9,7 +9,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; -require_once dirname(__FILE__) . '/../mock_user.php'; +require_once dirname(__FILE__) . '/../mock/user.php'; require_once dirname(__FILE__) . '/../mock/cache.php'; class phpbb_text_processing_censor_text_test extends phpbb_test_case |