Merge pull request #20347 from demeritcowboy/pass-compare

dev/core#2613 - Replace deprecated function in useradd task
civicrm · May 19, 2021 · bc360ba · bc360ba
2 parents fd8f3fc + 96000ce
commit bc360ba
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/CRM/Contact/Form/Task/Useradd.php b/CRM/Contact/Form/Task/Useradd.php
@@ -77,10 +77,7 @@ public function buildQuickForm() {
       $this->add('password', 'cms_pass', ts('Password'), ['class' => 'huge']);
       $this->add('password', 'cms_confirm_pass', ts('Confirm Password'), ['class' => 'huge']);
       $this->addRule('cms_pass', ts('Password is required'), 'required');
-      $this->addRule([
-        'cms_pass',
-        'cms_confirm_pass',
-      ], ts('Password mismatch'), 'compare');
+      $this->addFormRule(['CRM_Contact_Form_Task_Useradd', 'passwordMatch']);
     }
 
     $this->add('text', 'email', ts('Email'), ['class' => 'huge'])->freeze();
@@ -140,4 +137,18 @@ public static function usernameRule($params) {
     return empty($errors) ? TRUE : $errors;
   }
 
+  /**
+   * Validation Rule.
+   *
+   * @param array $params
+   *
+   * @return array|bool
+   */
+  public static function passwordMatch($params) {
+    if ($params['cms_pass'] !== $params['cms_confirm_pass']) {
+      return ['cms_pass' => ts('Password mismatch')];
+    }
+    return TRUE;
+  }
+
 }