From 1355d079ef9ddcb53c4b0db91d0cc06ad7535018 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 24 Mar 2018 15:30:37 +1300
Subject: [PATCH] [NFC] remove unused vars

---
 CRM/Contact/Form/Edit/Address.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CRM/Contact/Form/Edit/Address.php b/CRM/Contact/Form/Edit/Address.php
index b6df73e0ec..366d02ba44 100644
--- a/CRM/Contact/Form/Edit/Address.php
+++ b/CRM/Contact/Form/Edit/Address.php
@@ -56,9 +56,6 @@ class CRM_Contact_Form_Edit_Address {
       $blockId = $addressBlockCount;
     }
 
-    $config = CRM_Core_Config::singleton();
-    $countryDefault = $config->defaultContactCountry;
-
     $form->applyFilter('__ALL__', 'trim');
 
     $js = array();
@@ -93,7 +90,6 @@ class CRM_Contact_Form_Edit_Address {
     $addressOptions = CRM_Core_BAO_Setting::valueOptions(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
       'address_options', TRUE, NULL, TRUE
     );
-    $attributes = CRM_Core_DAO::getAttribute('CRM_Core_DAO_Address');
 
     $elements = array(
       'address_name',
@@ -115,7 +111,7 @@ class CRM_Contact_Form_Edit_Address {
     );
 
     foreach ($elements as $name) {
-      //Remove id from name, to allow comparison against enabled addressOtions.
+      //Remove id from name, to allow comparison against enabled addressOptions.
       $nameWithoutID = strpos($name, '_id') !== FALSE ? substr($name, 0, -3) : $name;
       // Skip fields which are not enabled in the address options.
       if (empty($addressOptions[$nameWithoutID])) {
@@ -204,8 +200,7 @@ class CRM_Contact_Form_Edit_Address {
       // more handling done in formRule func
       CRM_Contact_Form_Edit_Address::storeRequiredCustomDataInfo($form, $groupTree);
 
-      $template = CRM_Core_Smarty::singleton();
-      $tplGroupTree = $template->get_template_vars('address_groupTree');
+      $tplGroupTree = CRM_Core_Smarty::singleton()->get_template_vars('address_groupTree');
       $tplGroupTree = empty($tplGroupTree) ? array() : $tplGroupTree;
 
       $form->assign('address_groupTree', $tplGroupTree + array($blockId => $groupTree));
-- 
2.25.1