1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

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
This commit is contained in:
Nils Adermann
2014-04-10 14:22:36 -07:00
5 changed files with 34 additions and 16 deletions

View File

@@ -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,

View File

@@ -46,4 +46,9 @@ class phpbb_mock_user
}
return false;
}
public function lang()
{
return implode(' ', func_get_args());
}
}