diff --git a/CHANGELOG.md b/CHANGELOG.md index 11098fcc4ee2f448029e1956d65197175b0240e6..af72883c166d0758db3b91a76544c7c0b392685a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Version 1.4-dev (not yet released) -================================== +Version 1.4 +=========== **Requires action-provider version 1.9 or newer!** diff --git a/CRM/FormProcessor/Upgrader.php b/CRM/FormProcessor/Upgrader.php index ee941c3338837e061388d7d48ea5ee16c61eccfa..1cf675b18db7877ba7e527e4aa0967fb64c4134f 100644 --- a/CRM/FormProcessor/Upgrader.php +++ b/CRM/FormProcessor/Upgrader.php @@ -71,7 +71,7 @@ class CRM_FormProcessor_Upgrader extends CRM_FormProcessor_Upgrader_Base { public static function getUnmetDependencyErrorMessage($unmet) { switch ($unmet[0]) { case 'action-provider': - return ts('Form Processor was installed successfully, but you must also install and enable the <a href="%1">action-provider Extension</a> version %2 or newer.', array(1 => 'https://lab.civicrm.org/jaapjansma/action-provider', 2=>$unmet[1])); + return ts('Form Processor was installed successfully, but you must also install and enable the <a href="%1">action-provider Extension</a> version %2 or newer.', array(1 => 'https://lab.civicrm.org/extensions/action-provider', 2=>$unmet[1])); } CRM_Core_Error::fatal(ts('Unknown error key: %1', array(1 => $unmet))); @@ -92,7 +92,7 @@ class CRM_FormProcessor_Upgrader extends CRM_FormProcessor_Upgrader_Base { $unmet = array(); foreach($dependencies as $ext) { - if (!self::checkExtensionVersion($ext[0], '1.9')) { + if (!self::checkExtensionVersion($ext[0], $ext[1])) { array_push($unmet, $ext); } } diff --git a/info.xml b/info.xml index c822036ea7d1ce289d5a7ad68f7fb3635e622f79..1f2b23ebe3cc8b9feeac0fe4e7b60aaf41648f41 100644 --- a/info.xml +++ b/info.xml @@ -16,8 +16,8 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> <url desc="Action-Provider Extension">https://lab.civicrm.org/extensions/action-provider</url> </urls> - <releaseDate>2019-07-15</releaseDate> - <version>1.4-dev</version> + <releaseDate>2019-11-26</releaseDate> + <version>1.4</version> <develStage>stable</develStage> <compatibility> <ver>4.7</ver>