diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-01 19:28:37 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-01 19:28:37 +0300 |
| commit | b548389207fbf8e7c0d3287cd8704f05119d853a (patch) | |
| tree | b463fab12ef66897d6c392d104ad618bfb5a6646 /tests/text_processing/make_clickable_test.php | |
| parent | 4b2ede433e9336cf115fdd41e5c88738b03aa448 (diff) | |
| parent | 2b3cfa0f7b9690907e5a72f6e94e2dc51afbe96b (diff) | |
| download | forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.gz forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.bz2 forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.xz forums-b548389207fbf8e7c0d3287cd8704f05119d853a.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10665
* upstream/develop:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10731] Fixed addquote() to work on opera browser.
[ticket/10731] Fixed addquote() to work on opera browser.
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
[ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
[ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
[ticket/10675] Add disk full language string when posting attachments
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( |