diff options
author | Andreas Fischer <bantu@phpbb.com> | 2014-04-15 11:38:21 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2014-04-15 11:38:21 +0200 |
commit | 7d4be1fe195061fa9ff38d2b83480874843d36bb (patch) | |
tree | b8edaab4ecf042e6d9cce8d3239aca3b61a0ea8e /phpBB/phpbb | |
parent | b487da7c053a129c8e06056e4659ba7928f63c40 (diff) | |
parent | 68bd70ef376cc3c6a5ac89e5c29f33df9247df9d (diff) | |
download | forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar.gz forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar.bz2 forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar.xz forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.zip |
Merge pull request #2286 from nickvergessen/ticket/12388
[ticket/12388] Fix translation of log entries without additional log data
* nickvergessen/ticket/12388:
[ticket/12388] Add tests for lang() use on log actions without data
[ticket/12388] Fix translation of log entries without additional log data
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/log/log.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 24eb408b63..44fba06d9d 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -558,6 +558,10 @@ class log implements \phpbb\log\log_interface $log[$i]['action'] = make_clickable($log[$i]['action']); */ } + else + { + $log[$i]['action'] = $this->user->lang($log[$i]['action']); + } $i++; } |