? follow-D7-619276-1.patch
Index: follow.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/follow/follow.info,v
retrieving revision 1.1
diff -u -p -r1.1 follow.info
--- follow.info	29 Apr 2009 17:20:42 -0000	1.1
+++ follow.info	30 Oct 2009 20:42:34 -0000
@@ -1,4 +1,5 @@
 ; $Id: follow.info,v 1.1 2009/04/29 17:20:42 q0rban Exp $
 name = Follow
 description = Add sitewide and per user links to social network profiles.
-core = 6.x
\ No newline at end of file
+core = 7.x
+files[] = follow.module
Index: follow.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/follow/follow.module,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 follow.module
--- follow.module	6 Oct 2009 15:19:26 -0000	1.1.2.14
+++ follow.module	30 Oct 2009 20:42:34 -0000
@@ -36,7 +36,7 @@ function follow_init() {
 function follow_menu() {
   $items = array();
 
-  $items['admin/build/follow'] = array(
+  $items['admin/config/services/follow'] = array(
     'title' => 'Site follow links',
     'description' => 'Add sitewide follow links',
     'page callback' => 'drupal_get_form',
@@ -76,8 +76,25 @@ function follow_links_user_access($uid) 
 /**
  * Implementation of hook_perm().
  */
-function follow_perm() {
-  return array('edit own follow links', 'edit site follow links', 'edit any user follow links', 'administer follow');
+function follow_permission() {
+  return array(
+    'edit own follow links' => array(
+      'title' => t('Edit own follow links'),
+      'description' => t(''),
+    ),
+    'edit site follow links' => array(
+      'title' => t('Edit the site-wide follow links'),
+      'description' => t(''),
+    ),
+    'edit any user follow links' => array(
+      'title' => t("Edit any user's follow links"),
+      'description' => t(''),
+    ),
+    'administer follow' => array(
+      'title' => t('Administer follow'),
+      'description' => t(''),
+    ),
+  );
 }
 
 /**
@@ -87,13 +104,13 @@ function follow_theme() {
   $items = array();
 
   $items['follow_links_form'] = array(
-    'arguments' => array('form' => array()),
+    'variables' => array('form' => array()),
   );
   $items['follow_links'] = array(
-    'arguments' => array('links' => array(), 'networks' => array()),
+    'variables' => array('links' => array(), 'networks' => array()),
   );
   $items['follow_link'] = array(
-    'arguments' => array('link' => NULL, 'title' => NULL),
+    'variables' => array('link' => NULL, 'title' => NULL),
   );
 
   return $items;
@@ -248,7 +265,9 @@ function _follow_block_content($uid = 0)
  *
  * @ingroup themeable
  */
-function theme_follow_links($links, $networks) {
+function theme_follow_links($variables) {
+  $links = $variables['links'];
+  $networks = $variables['networks'];
   $output = '<div class="follow-links clear-block">';
 
   foreach($links as $link) {
@@ -332,7 +351,7 @@ function _follow_block_config_links($uid
  *
  * @ingroup forms
  */
-function follow_links_form(&$form_state, $uid = 0) {
+ function follow_links_form($form, &$form_state, $uid = 0) {
   $form = array();
 
   $form['uid'] = array('#type' => 'hidden', '#value' => $uid);
@@ -438,6 +457,7 @@ function follow_links_form_submit($form,
  * @ingroup forms
  */
 function theme_follow_links_form($form) {
+  $form = $form['form'];
   $rows = array();
   $disabled_rows = array();
 
@@ -470,10 +490,10 @@ function theme_follow_links_form($form) 
 
   $output = '';
   if (count($rows)) {
-    $output .= theme('table', $header, $rows, array('id' => 'follow-links-weighted-form'));
+    $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'follow-links-weighted-form')));
   }
   if (count($disabled_rows)) {
-    $output .= theme('table', $disabled_header, $disabled_rows);
+    $output .= theme('table', array('header' => $disabled_header, 'rows' => $disabled_rows));
   }
   $output .= drupal_render($form);
 
@@ -505,10 +525,10 @@ function follow_settings_form() {
 function follow_links_load($uid = 0) {
   $links = array();
 
-  $sql = "SELECT * FROM {follow_links} WHERE uid = %d ORDER BY weight ASC";
-  $result = db_query($sql, $uid);
+  $sql = "SELECT * FROM {follow_links} WHERE uid = :uid ORDER BY weight ASC";
+  $result = db_query($sql, array(':uid' => $uid));
 
-  while ($link = db_fetch_object($result)) {
+  foreach ($result as $link) {
     $links[$link->name] = $link;
   }
 
