From cc35f6c7e38714eee72b02c3affc46d588002916 Mon Sep 17 00:00:00 2001
From: Mikkel Hoegh <mikkel@hoegh.org>
Date: Wed, 18 May 2011 19:47:29 +0200
Subject: [PATCH] PHP notice fixes.

---
 addresses.settings.inc                 |    1 +
 addresses_cck/addresses_cck.module     |   14 +++++++++-----
 addresses_phone/addresses_phone.module |    2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addresses.settings.inc b/addresses.settings.inc
index 3d10785..9505ae8 100644
--- a/addresses.settings.inc
+++ b/addresses.settings.inc
@@ -13,6 +13,7 @@
  */
 function _addresses_addressesfieldapi_form($fields = array(), $values = array()) {
   $field_weights = variable_get('addresses_field_weight', array());
+  $form = array();
 
   // Let users select if the address is the primary
   if (!empty($fields['is_primary'])) {
diff --git a/addresses_cck/addresses_cck.module b/addresses_cck/addresses_cck.module
index 9c9538c..f876a5f 100644
--- a/addresses_cck/addresses_cck.module
+++ b/addresses_cck/addresses_cck.module
@@ -197,10 +197,13 @@ function _addresses_cck_field_validate(&$form, &$form_state) {
   if (substr($form_state['values']['country'], 0, 4) == 'top_') {
     $form_state['values']['country'] = substr($form_state['values']['country'], 4);
   }
-  foreach (array_keys($form_state['values']['columns']) as $ftype) {
-    if ($form_state['values'][$ftype . '_select'] == ADDRESSES_FIELD_REQUIRED) {
-      form_set_value($form['field']['required'], TRUE, $form_state);
-      return;
+
+  if (isset($form_state['values']['columns']) && is_array($form_state['values']['columns'])) {
+    foreach (array_keys($form_state['values']['columns']) as $ftype) {
+      if ($form_state['values'][$ftype . '_select'] == ADDRESSES_FIELD_REQUIRED) {
+        form_set_value($form['field']['required'], TRUE, $form_state);
+        return;
+      }
     }
   }
   form_set_value($form['field']['required'], FALSE, $form_state);
@@ -258,8 +261,9 @@ function addresses_cck_widget(&$form, &$form_state, $field, $items, $delta = 0)
 
   // Get all form fields for building addresses
   $ftypes = module_invoke_all('addressesfieldapi', 'fields');
+  $fields = array();
   foreach (array_keys($ftypes) as $ftype) {
-    $fields[$ftype] = $field[$ftype];
+    $fields[$ftype] = (isset($field[$ftype])) ? $field[$ftype] : NULL;
   }
 
   // The Addresses field
diff --git a/addresses_phone/addresses_phone.module b/addresses_phone/addresses_phone.module
index 698edf8..00f2a74 100644
--- a/addresses_phone/addresses_phone.module
+++ b/addresses_phone/addresses_phone.module
@@ -12,6 +12,8 @@
  * allow other modules to add more fields to the addresses
  */
 function addresses_phone_addressesfieldapi($op, $fields = array(), $values = array()) {
+  $form = array();
+
   if ($op == 'fields') {
     return array(
       'phone' => array(
-- 
1.7.4.4