Merge pull request #31321 from civicrm/5.79

5.79
civicrm · Oct 18, 2024 · 12cd744 · 12cd744
2 parents 05e0e5c + 009c20f
commit 12cd744
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
@@ -137,7 +137,7 @@ public static function cleanDir(string $target, bool $rmdir = TRUE, bool $verbos
             }
           }
           elseif (is_dir($object)) {
-            CRM_Utils_File::cleanDir($object, TRUE, $verbose);
+            CRM_Utils_File::cleanDir($object, $rmdir, $verbose);
           }
           elseif (is_file($object)) {
             CRM_Utils_File::try_unlink($object, "file");

diff --git a/ext/eventcart/eventcart.php b/ext/eventcart/eventcart.php
@@ -13,7 +13,7 @@ function eventcart_civicrm_config(&$config) {
     return;
   }
   Civi::$statics[__FUNCTION__] = 1;
-  Civi::dispatcher()->addListener('hook_civicrm_pageRun', 'CRM_Event_Cart_PageCallback::run');
+  Civi::dispatcher()->addListener('hook_civicrm_pageRun', ['CRM_Event_Cart_PageCallback', 'run']);
 
   _eventcart_civix_civicrm_config($config);
 }