--- aggregator.module.original  Sat Apr 29 00:35:03 2006
+++ aggregator.module   Tue May  2 09:21:57 2006
@@ -213,6 +213,12 @@ function aggregator_settings() {
     '#description' => t('Older news items will be automatically discarded.  Requires crontab.')
   );
 
+  $form['aggregator_use_blank'] = array(
+    '#type' => 'checkbox', '#title' => t('Open remote links in a new browser tab/window'),
+    '#default_value' => variable_get('aggregator_use_blank', 'check'),
+    '#description' => t('Setting this will cause remote HREF links to have the target="_blank" inserted')
+  );
+
   $form['aggregator_category_selector'] = array(
     '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'check'),
     '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
@@ -735,7 +741,8 @@ function aggregator_refresh($feed) {
 
         if ($image['LINK'] && $image['URL'] && $image['TITLE']) {
           // Note, we should really use theme_image() here but that only works with local images it won't work with images fetched with a URL unless PHP version > 5
-          $image = '<a href="'. check_url($image['LINK']) .'" class="feed-image"><img src="'. check_url($image['URL']) .'" alt="'. check_plain($image['TITLE']) .'" /></a>';
+          $target = (variable_get('aggregator_use_blank', 0)) ? ('target="_blank"') : ('');
+          $image = '<a '.$target.' href="'. check_url($image['LINK']) .'" class="feed-image"><img src="'. check_url($image['URL']) .'" alt="'. check_plain($image['TITLE']) .'" /></a>';
         }
         else {
           $image = NULL;
@@ -1290,7 +1297,8 @@ function theme_aggregator_block_item($it
   }
 
   // Display the external link to the item.
-  $output .= '<a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a>\n";
+  $target = (variable_get('aggregator_use_blank', 0)) ? ('target="_blank"') : ('');
+  $output .= '<a '.$target.' href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a>\n";
 
   return $output;
 }
@@ -1305,9 +1313,10 @@ function theme_aggregator_block_item($it
  * @ingroup themeable
  */
 function theme_aggregator_summary_item($item) {
-  $output = '<a href="'. check_url($item->link) .'">'. check_plain($item->title) .'</a> <span class="age">'. t('%age old', array('%age' => format_interval(time() - $item->timestamp))) .'</span>';
+  $target = (variable_get('aggregator_use_blank', 0)) ? ('target="_blank"') : ('');
+  $output = '<a '.$target.' href="'. check_url($item->link) .'">'. check_plain($item->title) .'</a> <span class="age">'. t('%age old', array('%age' => format_interval(time() - $item->timestamp))) .'</span>';
   if ($item->feed_link) {
-    $output .= ', <span class="source"><a href="'. check_url($item->feed_link) .'">'. check_plain($item->feed_title) .'</a></span>';
+    $output .= ', <span class="source"><a '.$target.' href="'. check_url($item->feed_link) .'">'. check_plain($item->feed_title) .'</a></span>';
   }
   return $output ."\n";
 }
@@ -1332,7 +1341,8 @@ function theme_aggregator_page_item($ite
   }
 
   $output .= "<div class=\"feed-item\">\n";
-  $output .= '<h3 class="feed-item-title"><a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></h3>\n";
+  $target = (variable_get('aggregator_use_blank', 0)) ? ('target="_blank"') : ('');
+  $output .= '<h3 class="feed-item-title"><a '.$target.' href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></h3>\n";
   $output .= "<div class=\"feed-item-meta\">$source <span class=\"feed-item-date\">$source_date</span></div>\n";
 
   if ($item->description) {