diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-12 11:48:15 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-12 11:48:15 +0400 |
| commit | 3765d51edf860511a9a2bde0c29368194f0c2c07 (patch) | |
| tree | 77a911c48c5527767b42a953b12542a69f6ccefd /tests | |
| parent | 713995fb9213983ce9cf4b6a711a1002dcc02e1a (diff) | |
| parent | d27fa5b790afcbc032bd2e8fa5358f203d24071f (diff) | |
Merge branch 'master' of github.com:piwik/piwik
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PHPUnit/Fixture.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php index 44209423c6..501bcc6d40 100644 --- a/tests/PHPUnit/Fixture.php +++ b/tests/PHPUnit/Fixture.php @@ -297,7 +297,8 @@ class Fixture extends PHPUnit_Framework_Assert // make sure the plugin that executed this method is included in the plugins to load $extraPlugins = array_merge($extraPluginsToLoad, array( \Piwik\Plugin::getPluginNameFromBacktrace(debug_backtrace()), - \Piwik\Plugin::getPluginNameFromNamespace($testCaseClass) + \Piwik\Plugin::getPluginNameFromNamespace($testCaseClass), + \Piwik\Plugin::getPluginNameFromNamespace(get_called_class()) )); foreach ($extraPlugins as $pluginName) { if (empty($pluginName)) { |