Merge pull request #271 from wmortada/civix-upgrade

eileenmcnaughton · web-flow · commit 68dc4d05159a · 2024-08-28T21:20:08.000+12:00
Civix upgrade
diff --git a/info.xml b/info.xml
@@ -29,7 +29,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.1</mixin>
   </mixins>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
diff --git a/mixin/smarty-v2@1.0.0.mixin.php b/mixin/smarty-v2@1.0.0.mixin.php
diff --git a/omnipaymultiprocessor.php b/omnipaymultiprocessor.php
@@ -14,7 +14,6 @@ function omnipaymultiprocessor_civicrm_container(ContainerBuilder $container) {
   $container->addCompilerPass(new Civi\OmnipayMultiProcessor\ActionProvider\CompilerPass(), PassConfig::TYPE_OPTIMIZE);
 }
 
-
 /**
  * Implementation of hook_civicrm_config
  *

-Original file line number
+Diff line change
     <mixin>[email protected]</mixin>
     <mixin>[email protected]</mixin>
     <mixin>[email protected]</mixin>
 -    <mixin>[email protected].0</mixin>
 +    <mixin>[email protected].1</mixin>
   </mixins>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ function omnipaymultiprocessor_civicrm_container(ContainerBuilder $container) {`
`14`	`14`	`$container->addCompilerPass(new Civi\OmnipayMultiProcessor\ActionProvider\CompilerPass(), PassConfig::TYPE_OPTIMIZE);`
`15`	`15`	`}`
`16`	`16`
`17`		`-`
`18`	`17`	`/**`
`19`	`18`	`* Implementation of hook_civicrm_config`
`20`	`19`	`*`