CRM-16005 - Check for dompdf using more file patterns

diff --git a/CRM/Utils/Check/Security.php b/CRM/Utils/Check/Security.php
index 6552d0d1a3fbc62b93710e5b90c63e8958ae060a..4e43f0af778b0cc72895966fbf8b0620f79ec274 100644 (file)
--- a/CRM/Utils/Check/Security.php
+++ b/CRM/Utils/Check/Security.php
@@ -210,7 +210,10 @@ class CRM_Utils_Check_Security {
 
 
   /**
-   * Check that some files are not present
+   * Check that some files are not present.
+   *
+   * These files have generally been deleted but Civi source tree but could be
+   * left online if one does a faulty upgrade.
    *
    * @return array of messages
    */
@@ -219,7 +222,9 @@ class CRM_Utils_Check_Security {
 
     $messages = array();
     $files = array(
-      "{$civicrm_root}/packages/dompdf/dompdf.php", // CRM-16005
+      "{$civicrm_root}/packages/dompdf/dompdf.php", // CRM-16005, upgraded from Civi <= 4.5.6
+      "{$civicrm_root}/packages/vendor/dompdf/dompdf/dompdf.php", // CRM-16005, Civi >= 4.5.7
+      "{$civicrm_root}/vendor/dompdf/dompdf/dompdf.php", // CRM-16005, Civi >= 4.6.0
     );
     foreach ($files as $file) {
       if (file_exists($file)) {