Fix integrity check (#12323)

1 files changed, 4 insertions, 2 deletions

diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
index caf90d323c..1cf19548f2 100644
--- a/core/FileIntegrity.php
+++ b/core/FileIntegrity.php
@@ -170,7 +170,8 @@ class FileIntegrity
         $directoriesFoundButNotExpected = array();
 
         foreach (self::getPathsToInvestigate() as $file) {
-            $file = substr($file, 2); // remove starting characters ./ to match format in manifest.inc.php
+            $file = substr($file, strlen(PIWIK_DOCUMENT_ROOT)); // remove piwik path to match format in manifest.inc.php
+            $file = ltrim($file, DIRECTORY_SEPARATOR);
             $directory = dirname($file);
 
             if(in_array($directory, $directoriesInManifest)) {
@@ -208,7 +209,8 @@ class FileIntegrity
             if (is_dir($file)) {
                 continue;
             }
-            $file = substr($file, 2); // remove starting characters ./ to match format in manifest.inc.php
+            $file = substr($file, strlen(PIWIK_DOCUMENT_ROOT)); // remove piwik path to match format in manifest.inc.php
+            $file = ltrim($file, DIRECTORY_SEPARATOR);
 
             if (self::isFileFromPluginNotInManifest($file, $pluginsInManifest)) {
                 continue;