diff options
| author | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
|---|---|---|
| committer | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
| commit | fd55c8664a046258c12e8a207d44340010155627 (patch) | |
| tree | 1a520b8965b88f39cee72e5ce8bb093fb9c38d35 /tests/text_processing/make_clickable_test.php | |
| parent | daee25340381d4b97119be298a9fc2671e681bb3 (diff) | |
| parent | 41e03164c19751624968435f31f1b63367cd4eb2 (diff) | |
| download | forums-fd55c8664a046258c12e8a207d44340010155627.tar forums-fd55c8664a046258c12e8a207d44340010155627.tar.gz forums-fd55c8664a046258c12e8a207d44340010155627.tar.bz2 forums-fd55c8664a046258c12e8a207d44340010155627.tar.xz forums-fd55c8664a046258c12e8a207d44340010155627.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Diffstat (limited to 'tests/text_processing/make_clickable_test.php')
| -rw-r--r-- | tests/text_processing/make_clickable_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php index 8697907311..d94fac2ae4 100644 --- a/tests/text_processing/make_clickable_test.php +++ b/tests/text_processing/make_clickable_test.php @@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; class phpbb_text_processing_make_clickable_test extends phpbb_test_case { - public static function make_clickable_data() + public function make_clickable_data() { // value => whether it should work $prefix_texts = array( |