diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:22:36 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:22:36 -0700 |
| commit | 497d81af68b4e224ec5a7fe9429e391f8087aaef (patch) | |
| tree | 9d9ceb853515afff314e1e94b74cf4937567c87f /tests/log | |
| parent | 90ebd49a2b64b731c037dceb5c85d3d81b152947 (diff) | |
| parent | 2fcfca73696bd7cc24dbadee147ee7a72526b3b7 (diff) | |
| download | forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.gz forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.bz2 forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.xz forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
[ticket/12113] Fix view_log() tests
[ticket/12113] Correctly use plurals when deleting user warnings
[ticket/12113] Allow log entries to use plurals
Diffstat (limited to 'tests/log')
| -rw-r--r-- | tests/log/function_view_log_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 017484e8a7..9148d23bb4 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -44,7 +44,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'topic_id' => 0, 'viewforum' => '', - 'action' => 'installed: 3.1.0-dev', + 'action' => 'LOG_INSTALL_INSTALLED 3.1.0-dev', ), 2 => array( 'id' => 2, |