Merge pull request #14897 from mattwire/membership_payment2

[civicrm-core.git] / CRM / Admin / Form / Preferences / Address.php

diff --git a/CRM/Admin/Form/Preferences/Address.php b/CRM/Admin/Form/Preferences/Address.php
index 0eb2b22faf0d419b4b3fb12642e1cc9574ed2c5d..059b5bc6ff5f42947efd54224c78fefb041fc9e1 100644 (file)
--- a/CRM/Admin/Form/Preferences/Address.php
+++ b/CRM/Admin/Form/Preferences/Address.php
@@ -52,7 +52,7 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
   public function buildQuickForm() {
     $this->applyFilter('__ALL__', 'trim');
 
-    $this->addFormRule(array('CRM_Admin_Form_Preferences_Address', 'formRule'));
+    $this->addFormRule(['CRM_Admin_Form_Preferences_Address', 'formRule']);
 
     //get the tokens for Mailing Label field
     $tokens = CRM_Core_SelectValues::contactTokens();
@@ -99,7 +99,7 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
     if (CRM_Utils_Array::value($addressOptions['County'], $this->_params['address_options'])) {
       $countyCount = CRM_Core_DAO::singleValueQuery("SELECT count(*) FROM civicrm_county");
       if ($countyCount < 10) {
-        CRM_Core_Session::setStatus(ts('You have enabled the County option. Please ensure you populate the county table in your CiviCRM Database. You can find extensions to populate counties in the <a %1>CiviCRM Extensions Directory</a>.', array(1 => 'href="' . CRM_Utils_System::url('civicrm/admin/extensions', array('reset' => 1), TRUE, 'extensions-addnew') . '"')),
+        CRM_Core_Session::setStatus(ts('You have enabled the County option. Please ensure you populate the county table in your CiviCRM Database. You can find extensions to populate counties in the <a %1>CiviCRM Extensions Directory</a>.', [1 => 'href="' . CRM_Utils_System::url('civicrm/admin/extensions', ['reset' => 1], TRUE, 'extensions-addnew') . '"']),
           ts('Populate counties'),
           "info"
         );