/[drupal]/contributions/modules/FriendFeed/friendfeed.module
ViewVC logotype

Diff of /contributions/modules/FriendFeed/friendfeed.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.2.2.4, Wed Jul 2 20:33:24 2008 UTC revision 1.1.2.2.2.5, Wed Jul 9 03:12:27 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: friendfeed.module,v 1.1.2.2.2.3 2008/07/02 20:30:26 robloach Exp $  // $Id: friendfeed.module,v 1.1.2.2.2.4 2008/07/02 20:33:24 robloach Exp $
3    
4  /**  /**
5   * Implementation of hook_perm().   * Implementation of hook_perm().
# Line 154  function friendfeed_block($op = 'list', Line 154  function friendfeed_block($op = 'list',
154        $username = variable_get('friendfeed_block_username', '');        $username = variable_get('friendfeed_block_username', '');
155        if (empty($username)) {        if (empty($username)) {
156          if (arg(0) == 'user') {          if (arg(0) == 'user') {
157            $user = user_load(arg(1));            $user = user_load(array('uid' => arg(1)));
158            $username = $user->friendfeed_username;            $username = $user->friendfeed_username;
159          }          }
160          else {          else {
# Line 199  function friendfeed_user_feed($username, Line 199  function friendfeed_user_feed($username,
199   * Menu callback; display a user's FriendFeed status by UserID.   * Menu callback; display a user's FriendFeed status by UserID.
200   */   */
201  function friendfeed_user_view_uid($uid, $service = NULL, $start = 0, $num = 30) {  function friendfeed_user_view_uid($uid, $service = NULL, $start = 0, $num = 30) {
202    $user = user_load($uid);    $user = user_load(array('uid' => $uid));
203    return friendfeed_user_view($user, $service, $start, $num);    return friendfeed_user_view($user, $service, $start, $num);
204  }  }
205    
Legend:
Removed from v.1.1.2.2.2.4  
changed lines
  Added in v.1.1.2.2.2.5
  ViewVC Help
Powered by ViewVC 1.1.2