Index: cck_field_privacy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck_field_privacy/cck_field_privacy.module,v
retrieving revision 1.3.2.2.2.4
diff -u -r1.3.2.2.2.4 cck_field_privacy.module
--- cck_field_privacy.module	15 Nov 2008 00:49:36 -0000	1.3.2.2.2.4
+++ cck_field_privacy.module	15 Nov 2008 23:12:11 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: cck_field_privacy.module,v 1.3.2.2.2.4 2008/11/15 00:49:36 obsidiandesign Exp $
+// $Id$
 
 /* TODO
    There is a new hook_watchdog in core. This means that contributed modules
@@ -185,7 +185,16 @@
                 // Add the padlock icon & link to the JQuery function
                 // @TODO: Add this via jQuery to degrade gracefully in browsers without JavaScript enabled.
                 // @TODO: Get the padlock to also appear on field group titles (fieldset legends), if selected.
-                $form_field['#title'] .= "<a href='#' id='". $field ."link' ><img src='". base_path() . drupal_get_path('module', 'cck_field_privacy') ."/padlock.png' /></a>";
+                if (isset($form[$field]['#title'])) {
+                  $form[$field]['#title'] .= "<a href='#' id='". $field ."link' ><img src='". base_path() . drupal_get_path('module', 'cck_field_privacy') ."/padlock.png' /></a>";
+                }
+                if (isset($form_field['#title'])) {
+                  $form_field['#title'] .= "<a href='#' id='". $field ."link' ><img src='". base_path() . drupal_get_path('module', 'cck_field_privacy') ."/padlock.png' /></a>";
+                }
+                if (isset($form_field[0]['#title'])) {
+                  $form_field[0]['#title'] .= "<a href='#' id='". $field ."link' ><img src='". base_path() . drupal_get_path('module', 'cck_field_privacy') ."/padlock.png' /></a>";
+                }
+                $form['#field_info'][$field]['widget']['label'] .= "<a href='#' id='". $field ."link' ><img src='". base_path() . drupal_get_path('module', 'cck_field_privacy') ."/padlock.png' /></a>";
               }
             }
           }