2 files changed, 6 insertions, 11 deletions
diff --git a/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php b/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php
index 7393877175..e9e58fdd8b 100644
--- a/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php
+++ b/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php
@@ -8,7 +8,7 @@
 namespace Piwik\Plugins\Diagnostics\Diagnostic;
 
 use Piwik\Development;
-use Piwik\Filechecks;
+use Piwik\FileIntegrity;
 use Piwik\Translation\Translator;
 
 /**
@@ -31,22 +31,16 @@ class FileIntegrityCheck implements Diagnostic
         $label = $this->translator->translate('Installation_SystemCheckFileIntegrity');
 
         if(Development::isEnabled()) {
-            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK));
+            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, '(Disabled in development mode)'));
         }
 
-        $messages = Filechecks::getFileIntegrityInformation();
-        $ok = array_shift($messages);
-
-        if (empty($messages)) {
-            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK));
-        }
+        list($ok, $messages) = FileIntegrity::getFileIntegrityInformation();
 
         if ($ok) {
-            $status = DiagnosticResult::STATUS_WARNING;
-            return array(DiagnosticResult::singleResult($label, $status, $messages[0]));
+            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK, implode('<br/>', $messages)));
         }
 
-        $comment = $this->translator->translate('General_FileIntegrityWarningExplanation');
+        $comment = $this->translator->translate('General_FileIntegrityWarning');
 
         // Keep only the 20 first lines else it becomes unmanageable
         if (count($messages) > 20) {
diff --git a/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php b/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php
index e89cf2e290..1a454de0d5 100644
--- a/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php
+++ b/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php
@@ -57,6 +57,7 @@ class RecommendedFunctionsCheck implements Diagnostic
             'parse_ini_file',
             'glob',
             'gzopen',
+            'md5_file',
         );
     }