diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2020-01-01 00:33:50 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-01 00:33:50 +0300 |
commit | 38d342a178e06b050fdf4abcadcb94090a0e0479 (patch) | |
tree | 0534040a53fcfe238466c882513204087595401b /plugins | |
parent | 0f88558b329d21c7739673c18826df2475850ffa (diff) |
Fix build (#15334)
* test no longer relevant
* update submodule
* fix integration test
* Do not forward query params for Goals.getMetrics inner API call.
Diffstat (limited to 'plugins')
m--------- | plugins/AnonymousPiwikUsageMeasurement | 0 | ||||
-rw-r--r-- | plugins/Goals/API.php | 4 | ||||
-rw-r--r-- | plugins/Monolog/tests/System/TrackerLoggingTest.php | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 49427328cc2d6e0987cedda0b122c5fad2a7bf5 +Subproject 4f57457a52bf6521fa662046f6585102245b770 diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index d840125007..32cc3a07e7 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -15,10 +15,8 @@ use Piwik\CacheId; use Piwik\Cache as PiwikCache; use Piwik\Common; use Piwik\DataTable; -use Piwik\Db; use Piwik\Metrics; use Piwik\Piwik; -use Piwik\Plugin\Report; use Piwik\Plugins\API\DataTable\MergeDataTables; use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate; use Piwik\Plugins\Goals\Columns\Metrics\AverageOrderRevenue; @@ -467,7 +465,7 @@ class API extends \Piwik\Plugin\API 'columns' => $columns, 'showAllGoalSpecificMetrics' => $showAllGoalSpecificMetrics, 'format_metrics' => Common::getRequestVar('format_metrics', 'bc'), - )); + ), $default = []); $tableSegmented->filter('Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames', array($appendToMetricName)); diff --git a/plugins/Monolog/tests/System/TrackerLoggingTest.php b/plugins/Monolog/tests/System/TrackerLoggingTest.php index 44a7755e9f..0942be7560 100644 --- a/plugins/Monolog/tests/System/TrackerLoggingTest.php +++ b/plugins/Monolog/tests/System/TrackerLoggingTest.php @@ -76,10 +76,7 @@ class TrackerLoggingTest extends SystemTestCase { $response = $t->doTrackPageView('incredible title!'); - $this->assertStringStartsWith("DEBUG: Debug enabled - Input parameters: array ( - 'idsite' => '1', - 'rec' => '1', - 'apiv' => '1',", $response); + $this->assertRegExp('/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] ' . preg_quote("piwik.DEBUG: Debug enabled - Input parameters: array ( 'idsite' => '1', 'rec' => '1', 'apiv' => '1',") . "/", $response); } private function setTrackerConfig($trackerConfig) |