Index: aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.306
diff -u -F^function -r1.306 aggregator.module
--- aggregator.module   17 Sep 2006 19:14:15 -0000      1.306
+++ aggregator.module   2 Oct 2006 18:03:21 -0000
@@ -137,13 +137,14 @@ function aggregator_menu($may_cache) {
             'weight' => -10);
           $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/categorize',
             'title' => t('categorize'),
-            'callback' => 'aggregator_page_source',
+            'callback' => 'drupal_get_form',
+            'callback arguments' => array('aggregator_page_source'),
             'access' => $edit,
             'type' => MENU_LOCAL_TASK);
           $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/configure',
             'title' => t('configure'),
-            'callback' => 'aggregator_form_feed',
-            'callback arguments' => array($feed),
+            'callback' => 'drupal_get_form',
+            'callback arguments' => array('aggregator_form_feed', $feed),
             'access' => $edit,
             'type' => MENU_LOCAL_TASK,
             'weight' => 1);
@@ -1059,13 +1060,14 @@ function aggregator_page_category() {

 function aggregator_page_list($sql, $header, $categorize) {
   $form['header'] = array('#value' => $header);
+  $form['#id'] = 'aggregator';
   $result = pager_query($sql, 20);
   $categories = array();
   $done = FALSE;
   $form['items'] = array();
   while ($item = db_fetch_object($result)) {
-    $form['items'][$item->iid] = array('#value' => theme('aggregator_page_item', $item));
-    $form['categories'][$item->iid] = array();
+    $form[$item->iid]['items'] = array('#value' => theme('aggregator_page_item', $item));
+    $form[$item->iid]['categories'] = array();
     if ($categorize) {
       $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = %d', $item->iid);
       $selected = array();
@@ -1078,7 +1080,7 @@ function aggregator_page_list($sql, $hea
         }
       }
       $done = TRUE;
-      $form['categories'][$item->iid] = array(
+      $form[$item->iid]['categories'] = array(
         '#type' => variable_get('aggregator_category_selector', 'checkboxes'),
         '#default_value' => $selected, '#options' => $categories,
         '#size' => 10, '#multiple' => TRUE
@@ -1104,8 +1106,8 @@ function _aggregator_page_list($sql, $op
   else {
     $output = '<div id="aggregator">';
     $output .= $header;
-    foreach ($form['items'] as $item) {
-      $output .= $item['#value'];
+    foreach ($form as $item) {
+      $output .= $item['items']['#value'];
     }
     $output .= '</div>';
     $output .= $form['pager']['#value'];
@@ -1299,7 +1301,7 @@ function theme_aggregator_feed($feed) {
   $output .= '<div class="feed-url"><em>'. t('URL:') .'</em> '. l($feed->link, $feed->link, array(), NULL, NULL, TRUE) ."</div>\n";

   if ($feed->checked) {
-    $updated = t('%time ago', array('%time' => format_interval(time() - $feed->checked)));
+    $updated = t('@time ago', array('@time' => format_interval(time() - $feed->checked)));
   }
   else {
     $updated = t('never');