Merge pull request #23737 from eileenmcnaughton/import_up_multi

[civicrm-core.git] / ext / payflowpro / payflowpro.civix.php

diff --git a/ext/payflowpro/payflowpro.civix.php b/ext/payflowpro/payflowpro.civix.php
index 1eeb5420c0c4921c8c299bd67725dd1810286702..02c9abccac903666a27290e5a44e6c249b7f62f9 100644 (file)
--- a/ext/payflowpro/payflowpro.civix.php
+++ b/ext/payflowpro/payflowpro.civix.php
@@ -91,9 +91,10 @@ function _payflowpro_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__
+    . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
@@ -204,24 +205,6 @@ function _payflowpro_civix_upgrader() {
   }
 }
 
-/**
- * Glob wrapper which is guaranteed to return an array.
- *
- * The documentation for glob() says, "On some systems it is impossible to
- * distinguish between empty match and an error." Anecdotally, the return
- * result for an empty match is sometimes array() and sometimes FALSE.
- * This wrapper provides consistency.
- *
- * @link http://php.net/glob
- * @param string $pattern
- *
- * @return array
- */
-function _payflowpro_civix_glob($pattern) {
-  $result = glob($pattern);
-  return is_array($result) ? $result : [];
-}
-
 /**
  * Inserts a navigation menu item at a given place in the hierarchy.
  *