CRM-15097 - CaseType::isForkable() - Allow variations on true/false/0/1

[civicrm-core.git] / CRM / Upgrade / Form.php

diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php
index bd2413619da48390ae63b9609f442f860cc61c50..b689907941aee12dc4c19b6cb2ee19bdbb2d98b7 100644 (file)
--- a/CRM/Upgrade/Form.php
+++ b/CRM/Upgrade/Form.php
@@ -645,13 +645,13 @@ SET    version = '$version'
    *
    * @param CRM_Queue_TaskContext $ctx
    * @param $rev string, the target (intermediate) revision e.g '3.2.alpha1'
-   * @param $currentVer string, the original revision
+   * @param $originalVer string, the original revision
    * @param $latestVer string, the target (final) revision
    * @param $postUpgradeMessageFile string, path of a modifiable file which lists the post-upgrade messages
    *
    * @return bool
    */
-  static function doIncrementalUpgradeStep(CRM_Queue_TaskContext$ctx, $rev, $currentVer, $latestVer, $postUpgradeMessageFile) {
+  static function doIncrementalUpgradeStep(CRM_Queue_TaskContext$ctx, $rev, $originalVer, $latestVer, $postUpgradeMessageFile) {
     $upgrade = new CRM_Upgrade_Form();
 
     $phpFunctionName = 'upgrade_' . str_replace('.', '_', $rev);
@@ -693,7 +693,7 @@ SET    version = '$version'
 
       if (is_callable(array(
         $versionObject, $phpFunctionName))) {
-        $versionObject->$phpFunctionName($rev);
+        $versionObject->$phpFunctionName($rev, $originalVer, $latestVer);
       }
       else {
         $upgrade->processSQL($rev);