Merge pull request #17345 from eileenmcnaughton/ev_batch

[civicrm-core.git] / CRM / Utils / File.php

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 11b8422a733d3150c4b25afc1601644c78001761..3ad79207b6711b83df29cfa8e54449c9c3f6b2a2 100644 (file)
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -1066,7 +1066,7 @@ HTACCESS;
    */
   public static function isValidFileName($fileName = NULL) {
     if ($fileName) {
-      $check = $fileName !== basename($fileName) ? FALSE : TRUE;
+      $check = ($fileName === basename($fileName));
       if ($check) {
         if (substr($fileName, 0, 1) == '/' || substr($fileName, 0, 1) == '.' || substr($fileName, 0, 1) == DIRECTORY_SEPARATOR) {
           $check = FALSE;
@@ -1082,7 +1082,7 @@ HTACCESS;
    * @param string $mimeType the mime-type we want extensions for
    * @return array
    */
-  public static function getAcceptableExtensionsForMimeType($mimeType = NULL) {
+  public static function getAcceptableExtensionsForMimeType($mimeType = []) {
     $mimeRepostory = new \MimeTyper\Repository\ExtendedRepository();
     return $mimeRepostory->findExtensions($mimeType);
   }