Index: modules/links/links_related.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/links/links_related.module,v
retrieving revision 1.8
diff -u -r1.8 links_related.module
--- modules/links/links_related.module	12 Dec 2005 17:34:25 -0000	1.8
+++ modules/links/links_related.module	28 Dec 2005 04:33:47 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: links_related.module,v 1.8 2005/12/12 17:34:25 syscrusher Exp $
+// $Id: links_related.module,v 1.8 2005-12-12 17:34:25 syscrusher Exp $
 
 // ****************** General hooks ***************************
 
@@ -128,27 +128,27 @@
   switch($op) {
     // Load the values of the special table from the database as needed
     case 'load':
-      if (variable_get('links_related_types_'. $node->type, FALSE) && ! is_array($_POST['edit']['links_links'])) {
+      if (variable_get('links_related_types_'. $node->type, FALSE) && ! is_array($_POST['edit']['links_related'])) {
           $links = links_load_links_for_node($node->nid, 'links_related');
-          return array('links_links'=>$links);
+          return array('links_related'=>$links);
       }
       break;
 
     // Copy values from the POST array into the working copy of the node
     case 'prepare':
-      if (variable_get('links_related_types_'. $node->type, FALSE) && ! isset($node->links_links)) {
+      if (variable_get('links_related_types_'. $node->type, FALSE) && ! isset($node->links_related)) {
         _links_related_sort_post_links();
-        $node->links_links = is_array($_POST['edit']['links_links']) ? $_POST['edit']['links_links'] : array();
-        _links_related_sort_links($node->links_links);
+        $node->links_related = is_array($_POST['edit']['links_related']) ? $_POST['edit']['links_related'] : array();
+        _links_related_sort_links($node->links_related);
       }
       break;
 
     case 'validate':
-      if (variable_get('links_related_types_'. $node->type, FALSE) && isset($node->links_links)) {
+      if (variable_get('links_related_types_'. $node->type, FALSE) && isset($node->links_related)) {
         _links_related_sort_post_links();
-        _links_related_sort_links($node->links_links);
-        foreach($node->links_links as $i=>$link) {
-          $node->links_links[$i]['url'] = links_normalize_url($link['url']);
+        _links_related_sort_links($node->links_related);
+        foreach($node->links_related as $i=>$link) {
+          $node->links_related[$i]['url'] = links_normalize_url($link['url']);
         }
       }
       break;
@@ -156,14 +156,14 @@
     // Delete the values from a node that is being erased
     // Don't care if it's "supposed" to have links -- delete if found anyway
     case 'delete':
-      links_delete_links_for_node($node);
+      links_delete_links_for_node($node, 'links_related');
       break;
 
     // Update the values in an existing record, or insert a new record.
     case 'insert':
     case 'update':
       if (variable_get('links_related_types_'. $node->type, FALSE)) {
-        links_save_links_for_node($node);
+        links_save_links_for_node($node, 'links_related');
       }
       break;
     case 'view':
@@ -206,11 +206,11 @@
       // links_related into appropriate node types' edit screens.
       $node = $form['#node'];
       if (variable_get('links_related_types_'.$node->type, 0)) {
-        _links_related_sort_links($node->links_links);
+        _links_related_sort_links($node->links_related);
 //        _links_related_sort_post_links();
-        $links =& $node->links_links;
+        $links =& $node->links_related;
 
-        $form['links_links'] = array(
+        $form['links_related'] = array(
           '#type' => 'fieldset',
           '#tree' => TRUE,
           '#title' => t('Related Links'),
@@ -218,21 +218,21 @@
           // Not collapsible if links are required
           '#collapsible' => variable_get('links_related_types_'.$node->type, 0) < 2,
           '#collapsed' => (count($links) == 0),
-          '#weight' => -16,
+          //'#weight' => -16,
         );
 
-        $form['links_links']['#theme'] = 'links_related_form';
+        $form['links_related']['#theme'] = 'links_related_form';
         // Existing links first
         $i = 0;
         foreach ($links as $link) {
-          $form['links_links'][$i] = links_related_form_line($link);
+          $form['links_related'][$i] = links_related_form_line($link);
           $i++;
         }
-        $form['links_links'][$i] = links_related_form_line(NULL);
+        $form['links_related'][$i] = links_related_form_line(NULL);
         if (variable_get('links_related_types_'.$node->type, 0) >= 2) {
           // The first one is required
-          $form['links_links'][0]['url']['#required'] = 1;
-          $form['links_links']['#title'] .= ' '.t('(at least one link required for this content type)');
+          $form['links_related'][0]['url']['#required'] = 1;
+          $form['links_related']['#title'] .= ' '.t('(at least one link required for this content type)');
         }
       }
       break;
@@ -383,7 +383,7 @@
 }
 
 /**
- * Compares two subarrays from $node->links_links and returns
+ * Compares two subarrays from $node->links_related and returns
  * an integer -1, 0, or 1 based on that comparison. (See PHP
  * function uasort() for details.)
  */
@@ -418,17 +418,17 @@
 
 /**
  * Works like _links_related_sort_links(), except operates
- * on $_POST['edit']['links_links'] intrinsically, rather
+ * on $_POST['edit']['links_related'] intrinsically, rather
  * than accepting a node as a parameter.
  */
 function _links_related_sort_post_links() {
-  if (is_array($_POST['edit']['links_links'])) {
-    foreach ($_POST['edit']['links_links'] as $i=>$link) {
+  if (is_array($_POST['edit']['links_related'])) {
+    foreach ($_POST['edit']['links_related'] as $i=>$link) {
       if ($link['delete'] || (empty($link['url']) && empty($link['link_title']))) {
-        unset($_POST['edit']['links_links'][$i]);
+        unset($_POST['edit']['links_related'][$i]);
       }
     }
-    uasort($_POST['edit']['links_links'], '_links_related_linkcompare');
+    uasort($_POST['edit']['links_related'], '_links_related_linkcompare');
   }
 }