diff options
| author | diosmosis <benaka@piwik.pro> | 2014-11-11 13:09:31 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-11-11 13:09:31 +0300 |
| commit | 6c54768997b69f25d187e419138fc998f30f7206 (patch) | |
| tree | 7f4f9218807587da3fb31fc277db88cd6e247db8 /tests/PHPUnit/Framework/TestRequest | |
| parent | 3c6796f46cb84f2086ae44556aaec01e715ee59f (diff) | |
| parent | 25d31ab85a2d5b01d5e8581c68051f509f495fdb (diff) | |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
core/DataTable/Filter/CalculateEvolutionFilter.php
plugins/UserSettings/API.php
Diffstat (limited to 'tests/PHPUnit/Framework/TestRequest')
| -rw-r--r-- | tests/PHPUnit/Framework/TestRequest/Response.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php index 087a18de1b..668b58e1a7 100644 --- a/tests/PHPUnit/Framework/TestRequest/Response.php +++ b/tests/PHPUnit/Framework/TestRequest/Response.php @@ -251,8 +251,6 @@ class Response // http://bugs.php.net/bug.php?id=54508 $response = str_replace('.000000</l', '</l', $response); //lat/long $response = str_replace('.00</revenue>', '</revenue>', $response); - $response = str_replace('.1</revenue>', '</revenue>', $response); - $response = str_replace('.11</revenue>', '</revenue>', $response); return $response; } |