[fixup atlink generator a bit Evan Prodromou **20080529171853] { hunk ./lib/util.php 363 -function common_at_link($profile_id, $nickname) { +function common_at_link($sender_id, $nickname) { + print_r('atlink generator got called'); hunk ./lib/util.php 366 - $profile = new Profile(); + $recipient = new Profile(); hunk ./lib/util.php 368 - $profile->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile_id.' and subscribed = id)', 'AND'); - $profile->whereAdd('nickname = "' . trim($nickname) . '"', 'AND'); - if ($profile->find(TRUE)) { - return ''.$nickname.''; + $recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender_id.' and subscribed = id)', 'AND'); + $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND'); + if ($recipient->find(TRUE)) { + return ''.$nickname.''; hunk ./lib/util.php 374 - $profile = new Profile(); + $recipient = new Profile(); hunk ./lib/util.php 376 - $profile->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$profile_id.' and subscriber = id)', 'AND'); - $profile->whereAdd('nickname = "' . trim($nickname) . '"', 'AND'); - if ($profile->find(TRUE)) { - return ''.$nickname.''; + $recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender_id.' and subscriber = id)', 'AND'); + $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND'); + if ($recipient->find(TRUE)) { + return ''.$nickname.''; hunk ./lib/util.php 382 - $sender = User::staticGet($profile_id); + $sender = User::staticGet($sender_id); hunk ./lib/util.php 384 - $recipient = User::staticGet('nickname', $nickname); - if ($recipient) { - $profile = $recipient->getProfile(); - return ''.$nickname.''; + $recipient_user = User::staticGet('nickname', $nickname); + if ($recipient_user) { + $recipient = $recipient->getProfile(); + return ''.$nickname.''; }