From b922bf9e72a5907a3d455a938cd99cd9b7422120 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 10 Jan 2022 16:14:50 +1300 Subject: [PATCH] Remove call to php 4 function This CRM-2122 seems to be php4 thing - it won't exist anymore https://php.uz/manual/en/function.fribidi-log2vis.php --- CRM/Contact/Form/Task/Label.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CRM/Contact/Form/Task/Label.php b/CRM/Contact/Form/Task/Label.php index ac1effae17..90461774ce 100644 --- a/CRM/Contact/Form/Task/Label.php +++ b/CRM/Contact/Form/Task/Label.php @@ -300,7 +300,6 @@ class CRM_Contact_Form_Task_Label extends CRM_Contact_Form_Task { if (isset($fv['merge_same_address'])) { CRM_Core_BAO_Address::mergeSameAddress($rows); - $individualFormat = TRUE; } // format the addresses according to CIVICRM_ADDRESS_FORMAT (CRM-1327) @@ -316,18 +315,6 @@ class CRM_Contact_Form_Task_Label extends CRM_Contact_Form_Task { } $row['id'] = $id; $formatted = CRM_Utils_Address::format($row, 'mailing_format', FALSE, TRUE, $tokenFields); - - // CRM-2211: UFPDF doesn't have bidi support; use the PECL fribidi package to fix it. - // On Ubuntu (possibly Debian?) be aware of http://pecl.php.net/bugs/bug.php?id=12366 - // Due to FriBidi peculiarities, this can't be called on - // a multi-line string, hence the explode+implode approach. - if (function_exists('fribidi_log2vis')) { - $lines = explode("\n", $formatted); - foreach ($lines as $i => $line) { - $lines[$i] = fribidi_log2vis($line, FRIBIDI_AUTO, FRIBIDI_CHARSET_UTF8); - } - $formatted = implode("\n", $lines); - } $rows[$id] = [$formatted]; } @@ -336,7 +323,7 @@ class CRM_Contact_Form_Task_Label extends CRM_Contact_Form_Task { } //call function to create labels - self::createLabel($rows, $fv['label_name']); + $this->createLabel($rows, $fv['label_name']); CRM_Utils_System::civiExit(); } -- 2.25.1