From 222c268278487df1b080654fed676e816aa5f34b Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 6 Jul 2017 08:19:49 +1000 Subject: [PATCH] Minor updates following testing and update version --- CRM/Utils/Check/Source.php | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/CRM/Utils/Check/Source.php b/CRM/Utils/Check/Source.php index 02c742ac40..e489227938 100644 --- a/CRM/Utils/Check/Source.php +++ b/CRM/Utils/Check/Source.php @@ -1,7 +1,7 @@ $civicrm_root . 'packages/Auth/SASL', 'name' => 'Auth/SASL'); + $files[] = array('path' => $civicrm_root . 'packages/Auth/SASL.php', 'name' => 'Auth/SASL.php'); + $files[] = array('path' => $civicrm_root . 'packages/Net/SMTP.php', 'name' => 'Net/SMTP.php'); + $files[] = array('path' => $civicrm_root . 'packages/Net/Socket.php', 'name' => 'Net/Socket.php'); + $files[] = array('path' => $civicrm_root . 'packages/_ORIGINAL_/Net/SMTP.php', 'name' => '_ORIGINAL_/Net/SMTP.php'); + $files[] = array('path' => $civicrm_root . 'vendor/pear/net_smtp/examples', 'name' => 'pear/net_smtp/examples'); + $files[] = array('path' => $civicrm_root . 'vendor/pear/net_smtp/tests', 'name' => 'pear/net_smtp/tests'); + $files[] = array('path' => $civicrm_root . 'vendor/pear/net_smtp/phpdoc.sh', 'name' => 'pear/net_smtp/phpdoc.sh'); return $files; } @@ -62,14 +62,13 @@ class CRM_Utils_Check_Source { $orphans = array(); foreach ($this->getRemovedFiles() as $file) { - if (file_exists($file)) { + if (file_exists($file['path'])) { $orphans[] = array( - 'name' => $file, - 'path' => $file, + 'name' => $file['name'], + 'path' => $file['path'], ); } } - usort($orphans, function ($a, $b) { // Children first, then parents. $diff = strlen($b['name']) - strlen($a['name']); -- 2.25.1