diff options
author | Matthieu Aubry <matt@piwik.org> | 2015-09-08 06:41:05 +0300 |
---|---|---|
committer | Matthieu Aubry <matt@piwik.org> | 2015-09-08 06:41:05 +0300 |
commit | 9c2ae2b007adb777f0e5289f628fa2a838966ffb (patch) | |
tree | 6f546bbd3814503aaf0127ec00c2b196692c548f /plugins/UserCountry | |
parent | fc4a8d0edd3718ce60ec0d4cf85066baa314f73e (diff) | |
parent | 4313272903c6678d7eecc800bcee1497395940c9 (diff) |
Merge pull request #8694 from ThaDafinser/feature/windows
Fixing PhpUnit support for windows
Diffstat (limited to 'plugins/UserCountry')
-rwxr-xr-x | plugins/UserCountry/GeoIPAutoUpdater.php | 2 | ||||
-rw-r--r-- | plugins/UserCountry/tests/Unit/UserCountryTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php index aba1d5d263..1359c8ac2e 100755 --- a/plugins/UserCountry/GeoIPAutoUpdater.php +++ b/plugins/UserCountry/GeoIPAutoUpdater.php @@ -268,7 +268,7 @@ class GeoIPAutoUpdater extends Task } $tempFile = GeoIp::getPathForGeoIpDatabase($tempFilename); - rename($existing = $tempFile, $newName = $oldDbFile); + rename($tempFile, $oldDbFile); // delete original archive if ($unlink) { diff --git a/plugins/UserCountry/tests/Unit/UserCountryTest.php b/plugins/UserCountry/tests/Unit/UserCountryTest.php index 9b62518e3e..dddbce6b9f 100644 --- a/plugins/UserCountry/tests/Unit/UserCountryTest.php +++ b/plugins/UserCountry/tests/Unit/UserCountryTest.php @@ -138,7 +138,7 @@ class UserCountryTest extends \PHPUnit_Framework_TestCase foreach ($filesToRemove as $name) { $path = $geoIpDirPath . '/' . $name; if (file_exists($path)) { - unlink($path); + @unlink($path); } } } |