Index: buddylist.module =================================================================== --- buddylist.module (revision 200) +++ buddylist.module (working copy) @@ -93,7 +93,7 @@

For more information, read the configuration and customization handbook Buddylist page

", array('@userprofiles' => url('profile'), - '@setaccesspermissions' => url('admin/user/access'), + '@setaccesspermissions' => url('admin/user/permissions'), '@blockadministration' => url('admin/build/block'), '@buddylistsettings' => url('admin/settings/buddylist') ) + buddylist_translation()); @@ -493,8 +493,9 @@ $buddies = buddylist_get_buddies($user->uid); $keys = array_keys($buddies); if (count($keys) > 0) { - $str_buddies = implode(',', $keys); - $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.status, n.type, u.uid, u.name, n.created, n.title FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.status = 1 AND n.uid IN ($str_buddies) ORDER BY n.nid DESC"), 0, variable_get('buddylist_posts_block', 7)); + $args = array_merge(array(0, variable_get('buddylist_posts_block', 7)), $keys); + $placeholders = implode(',', array_fill(0, count($keys), '%d')); + $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.status, n.type, u.uid, u.name, n.created, n.title FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.status = 1 AND n.uid IN ($placeholders) ORDER BY n.nid DESC"), $args); $node_title_list = node_title_list($result); @@ -1331,9 +1332,14 @@ function buddylist_buddygroup_new($uid, $group, $visible = TRUE) { $label_id = db_result(db_query("SELECT label_id FROM {buddylist_groups} WHERE uid = %d AND label = '%s'", $uid, $group)); if ($label_id === FALSE) { - $new_label_id = db_next_id('buddygroup'); - db_query("INSERT INTO {buddylist_groups} VALUES (%d, %d, '%s', %d)", $uid, $new_label_id, $group, $visible); - return $new_label_id; + $group = new stdClass(); + $group->uid = $uid; + //$group->label_id; + $group->label = $group; + $group->visible = $visible; + + drupal_write_record('buddylist_groups', $group); + return $group->label_id; } else { return $label_id;