aboutsummaryrefslogtreecommitdiffstats
path: root/tests/mock
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-04-10 14:22:36 -0700
committerNils Adermann <naderman@naderman.de>2014-04-10 14:22:36 -0700
commit497d81af68b4e224ec5a7fe9429e391f8087aaef (patch)
tree9d9ceb853515afff314e1e94b74cf4937567c87f /tests/mock
parent90ebd49a2b64b731c037dceb5c85d3d81b152947 (diff)
parent2fcfca73696bd7cc24dbadee147ee7a72526b3b7 (diff)
downloadforums-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/mock')
-rw-r--r--tests/mock/user.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/mock/user.php b/tests/mock/user.php
index bd547b3973..e57e86ae2f 100644
--- a/tests/mock/user.php
+++ b/tests/mock/user.php
@@ -46,4 +46,9 @@ class phpbb_mock_user
}
return false;
}
+
+ public function lang()
+ {
+ return implode(' ', func_get_args());
+ }
}