Index: banner.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/banner/banner.module,v
retrieving revision 1.74
diff -u -r1.74 banner.module
--- banner.module	30 Jan 2007 23:19:33 -0000	1.74
+++ banner.module	21 Feb 2007 05:46:30 -0000
@@ -1099,7 +1099,7 @@
 
     // basic information
     'url' => '',
-    'target' => '',
+    'frame_target' => '',
     'workflow' => 0,
     'mode' => 0,
     'banner_content' => '',
@@ -1527,7 +1527,7 @@
   );
   $row = array(array(
     $node->title,
-    _banner_link($node->url, $node->target),
+    _banner_link($node->url, $node->frame_target),
     _banner_workflow($node->workflow),
     theme('username', $node),
   ));
@@ -1680,10 +1680,10 @@
     '#maxlength' => 255,
     '#description' => t('Target URL for this banner. If your are linking to an internal page, you must provide the full URL (i.e. http://yoursite.com/node/42 instead of node/42).'),
   );
-  $form['target'] = array(
+  $form['frame_target'] = array(
     '#type' => 'select',
     '#title' => t('Target'),
-    '#default_value' => $node->target,
+    '#default_value' => $node->frame_target,
     '#options' => array(
       '_none'   => t('<none>'),
       '_blank'  => '_blank',
@@ -1985,8 +1985,8 @@
 
   // FIXME: used a couple of times in the code, move to separate function
   $url_attr = array('title' => $node->url);
-  if ($node->target != '_none') {
-    $url_attr['target'] = $node->target;
+  if ($node->frame_target != '_none') {
+    $url_attr['target'] = $node->frame_target;
   }
 
   $output = l(theme('banner_image', $node->banner_content, $img_attr), 'banner/'. $node->nid, $url_attr, NULL, NULL, FALSE, TRUE);
@@ -2009,14 +2009,14 @@
     // %url present in content, replace with banner link and target
     $replace = array(
       '%url' => check_url(url('banner/'. $node->nid)),
-      '%target' => $node->target != '_none' ? $node->target : '_self',
+      '%target' => $node->frame_target != '_none' ? $node->frame_target : '_self',
     );
     $output .= strtr($node->banner_content, $replace);
   }
   else {
     // no %url in content, add link at the end
     $attr = array(
-      'target' => $node->target != '_none' ? $node->target : '_self',
+      'target' => $node->frame_target != '_none' ? $node->frame_target : '_self',
     );
     $output .= $node->banner_content .' ';
     $output .= l(t('&raquo;'), 'banner/'. $node->nid, $attr, NULL, NULL, FALSE, TRUE);
@@ -2055,8 +2055,8 @@
       );
 
       $url_attr = array('title' => $node->url);
-      if ($node->target != '_none') {
-        $url_attr['target'] = $node->target;
+      if ($node->frame_target != '_none') {
+        $url_attr['target'] = $node->frame_target;
       }
       $output = l(theme('banner_image', file_create_url($file->filepath), $img_attr), 'banner/'. $node->nid, $url_attr, NULL, NULL, FALSE, TRUE);
       break;
