diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
| commit | 68363e362d4b6d3fe717a8ffae95ab13eb374e9f (patch) | |
| tree | eea655f80184a3cee5a95abec5da1437c6e9aa5a /tests/privmsgs | |
| parent | 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 (diff) | |
| parent | f5ed04f8ff0c65e1bfe6a4953b974315dd2790d7 (diff) | |
| download | forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.gz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.bz2 forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.xz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.zip | |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
phpBB/install/schemas/mssql_schema.sql
phpBB/report.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'tests/privmsgs')
| -rw-r--r-- | tests/privmsgs/delete_user_pms_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php index 3622eb30db..7be5429ca3 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -16,7 +16,7 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml'); } - public static function delete_user_pms_data() + static public function delete_user_pms_data() { return array( // array( |