Index: modules/news_page/news_page.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/news_page/news_page.module,v
retrieving revision 1.13
diff -u -r1.13 news_page.module
--- modules/news_page/news_page.module	14 Jan 2007 03:37:34 -0000	1.13
+++ modules/news_page/news_page.module	28 Feb 2007 02:18:04 -0000
@@ -135,17 +135,31 @@
   );
   
   $form['body_filter']['filter'] = filter_form($node->format);
-  
-  $results = db_query("SELECT cid, title FROM {aggregator_category}");
-  $row_count = db_num_rows($results);
-
-  if ($row_count == 0) form_set_error('cid', t('You must create at least 1 aggregator category before creating a news page.'));
 
   $categories[0] = t('--none--');
 
-  for ($counter = 1; $counter <=  $row_count; $counter++) {
-    $category= db_fetch_object ($results);
-    $categories[$category->cid] = $category->title;
+  if (module_exist('feedmanager')) {
+    $query = 
+    "SELECT cid, name
+    FROM {term_data} t
+    JOIN {aggregator_category_feed} c
+    ON c.cid = t.tid
+    GROUP BY cid";
+    $terms = db_query($query);
+    while ($term = db_fetch_object($terms)) {
+      $categories[$term->cid] = $term->name;
+    }
+  }
+  else {
+    $results = db_query("SELECT cid, title FROM {aggregator_category}");
+    $row_count = db_num_rows($results);
+  
+    if ($row_count == 0) form_set_error('cid', t('You must create at least 1 aggregator category before creating a news page.'));
+  
+    for ($counter = 1; $counter <=  $row_count; $counter++) {
+      $category= db_fetch_object ($results);
+      $categories[$category->cid] = $category->title;
+    }
   }
 
   $form['cid'] = array(
@@ -388,7 +402,7 @@
     WHERE c.cid = '$cid' 
     AND ( $news_query )
     ORDER BY timestamp DESC";
-    
+   
     return $filter_query;
 }
 
@@ -410,7 +424,12 @@
 	$output .= '<p>';
 
 	if ($item->description) {
-	  $output .= '<span class="feed-item-body">' . aggregator_filter_xss($item->description) . '</span>';
+    if (module_exist('feedmanager')) {
+  	  $output .= '<span class="feed-item-body">' . feedmanager_filter_xss($item->description) . '</span>';
+    }
+    else {
+  	  $output .= '<span class="feed-item-body">' . aggregator_filter_xss($item->description) . '</span>';
+    }
 	}
 	
 	if ($blogit) {