Replace LJ::u_equals function with $u->equals method.
Patch by denise.
diffs (466 lines):
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Comment.pm
--- a/cgi-bin/LJ/Comment.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Comment.pm Thu Jun 24 15:05:56 2010 -0500
@@ -1221,7 +1221,7 @@ sub _format_mail_both {
$who = $posteru->{name} . " (" . $posteru->display_username .
")";
}
}
- if (LJ::u_equals($targetu, $posteru)) {
+ if ( $targetu->equals( $posteru ) ) {
if ($edited) {
# 'You edit your comment to...';
$k_who = 'you.edit_reply_to';
@@ -1253,7 +1253,7 @@ sub _format_mail_both {
my $pwho = ''; #author of the commented post/comment. If empty - it's you
or anonymous
if ($is_html) {
- if (! $parent && ! LJ::u_equals($parentu, $targetu)) {
+ if (! $parent && ! $parentu->equals( $targetu ) ) {
# comment to a post and e-mail is going to be sent to not-AUTHOR
of the journal
my $p_profile_url = $entry->poster->profile_url;
# pwho - author of the post
@@ -1267,7 +1267,7 @@ sub _format_mail_both {
}
} elsif ($parent) {
my $threadu = $parent->poster;
- if ($threadu && ! LJ::u_equals($threadu, $targetu)) {
+ if ( $threadu && ! $threadu->equals( $targetu ) ) {
my $p_profile_url = $threadu->profile_url;
if ($threadu->{name} eq $threadu->display_username) {
$pwho = "<a href=\"$p_profile_url\">" .
$threadu->display_username . "</a>";
@@ -1278,7 +1278,7 @@ sub _format_mail_both {
}
}
} else {
- if (! $parent && ! LJ::u_equals($parentu, $targetu)) {
+ if (! $parent && ! $parentu->equals( $targetu ) ) {
if ($entry->poster->{name} eq $entry->poster->display_username) {
$pwho = $entry->poster->display_username;
} else {
@@ -1287,7 +1287,7 @@ sub _format_mail_both {
}
} elsif ($parent) {
my $threadu = $parent->poster;
- if ($threadu && ! LJ::u_equals($threadu, $targetu)) {
+ if ( $threadu && ! $threadu->equals( $targetu ) ) {
if ($threadu->{name} eq $threadu->display_username) {
$pwho = $threadu->display_username;
} else {
@@ -1299,7 +1299,7 @@ sub _format_mail_both {
}
# ESN directed to comment poster
- if (LJ::u_equals($targetu, $self->poster)) {
+ if ( $targetu->equals( $self->poster ) ) {
# ->parent returns undef/0 if parent is an entry.
if ($parent) {
if ($pwho) {
@@ -1313,7 +1313,7 @@ sub _format_mail_both {
$k_what = 'anonymous_comment';
}
}
- if (LJ::u_equals($targetu, $entry->journal)) {
+ if ( $targetu->equals( $entry->journal ) ) {
$k_what .= '.to_your_post2';
} else {
$k_what .= '.to_post2';
@@ -1326,7 +1326,7 @@ sub _format_mail_both {
}
}
# ESN directed to entry author
- } elsif (LJ::u_equals($targetu, $entry->journal)) {
+ } elsif ( $targetu->equals( $entry->journal ) ) {
if ($parent) {
if ($pwho) {
# '... another comment ' . $pwho . ' left in your post.';
diff -r 8311981630b7 -r 4cbbd2cbb6de
cgi-bin/LJ/Console/Command/ChangeJournalType.pm
--- a/cgi-bin/LJ/Console/Command/ChangeJournalType.pm Thu Jun 24 22:53:11
2010 +0800
+++ b/cgi-bin/LJ/Console/Command/ChangeJournalType.pm Thu Jun 24 15:05:56
2010 -0500
@@ -56,7 +56,7 @@ sub execute {
unless $u->is_person || $u->is_community;
return $self->error("You cannot convert your own account.")
- if LJ::u_equals($remote, $u);
+ if $remote && $remote->equals( $u );
my $typemap = { 'community' => 'C', 'person' => 'P' };
return $self->error("This account is already a $type account")
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Entry.pm
--- a/cgi-bin/LJ/Entry.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Entry.pm Thu Jun 24 15:05:56 2010 -0500
@@ -900,7 +900,7 @@ sub can_tellafriend {
# friends only
return 0 unless $entry->journal->is_person;
- return 0 unless LJ::u_equals($u, $entry->poster);
+ return 0 unless $u && $u->equals( $entry->poster );
return 1;
}
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Event/JournalNewComment.pm
--- a/cgi-bin/LJ/Event/JournalNewComment.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Event/JournalNewComment.pm Thu Jun 24 15:05:56 2010 -0500
@@ -106,20 +106,18 @@ sub as_email_subject {
my $key = 'esn.mail_comments.subject.';
if ($self->comment->subject_orig) {
return LJ::strip_html( $self->comment->subject_orig . $entry_details );
- } elsif (LJ::u_equals($self->comment->poster, $u)) {
+ } elsif ( $u && $u->equals( $self->comment->poster ) ) {
$key .= $edited ? 'comment_you_edited' : 'comment_you_posted';
} elsif ($self->comment->parent) {
- if ($edited) {
- $key .= LJ::u_equals($self->comment->parent->poster, $u) ?
'edit_reply_to_your_comment' : 'edit_reply_to_a_comment';
+ if ( $u && $u->equals( $self->comment->parent->poster ) ) {
+ $key .= $edited ? 'edit_reply_to_your_comment' :
'reply_to_your_comment';
} else {
- $key .= LJ::u_equals($self->comment->parent->poster, $u) ?
'reply_to_your_comment' : 'reply_to_a_comment';
+ $key .= $edited ? 'edit_reply_to_a_comment' : 'reply_to_a_comment';
}
+ } elsif ( $u && $u->equals( $self->comment->entry->poster ) ) {
+ $key .= $edited ? 'edit_reply_to_your_entry' : 'reply_to_your_entry';
} else {
- if ($edited) {
- $key .= LJ::u_equals($self->comment->entry->poster, $u) ?
'edit_reply_to_your_entry' : 'edit_reply_to_an_entry';
- } else {
- $key .= LJ::u_equals($self->comment->entry->poster, $u) ?
'reply_to_your_entry' : 'reply_to_an_entry';
- }
+ $key .= $edited ? 'edit_reply_to_an_entry' : 'reply_to_an_entry';
}
return LJ::Lang::get_text( $lang, $key ) . $entry_details;
@@ -342,7 +340,7 @@ sub subscription_as_html {
}
my ($user, $journal_is_owner);
- if (LJ::u_equals($journal, $subscr->owner)) {
+ if ( $journal->equals( $subscr->owner ) ) {
$user = 'my journal';
$key .= '.my_journal';
my $journal_is_owner = 1;
@@ -450,17 +448,19 @@ sub matches_filter {
my $watcher = $subscr->owner;
return 0 unless $comment->visible_to($watcher);
- # not a match if this user posted the comment and they don't
- # want to be notified of their own posts
- if (LJ::u_equals($comment->poster, $watcher)) {
- return 0 unless $watcher->can_get_self_email &&
$watcher->prop('opt_getselfemail');
- }
+ if ( $watcher ) {
+ # not a match if this user posted the comment and they don't
+ # want to be notified of their own posts
+ if ( $watcher->equals( $comment->poster ) ) {
+ return 0 unless $watcher->can_get_self_email &&
$watcher->prop('opt_getselfemail');
+ }
- # not a match if this user posted the entry and they don't want comments
emailed,
- # unless it is a reply to one of their comments or they posted it. (don't
need to check again for the cap, since we did above.)
- my $reply_to_own_comment = $comment->parent ? LJ::u_equals(
$comment->parent->poster, $watcher ) : 0;
- if ( LJ::u_equals( $entry->poster, $watcher ) && ! ( $reply_to_own_comment
|| $watcher->prop( 'opt_getselfemail' ) ) ) {
- return 0 if $entry->prop('opt_noemail') && $subscr->method =~ /Email$/;
+ # not a match if this user posted the entry and they don't want
comments emailed,
+ # unless it is a reply to one of their comments or they posted it.
(don't need to check again for the cap, since we did above.)
+ my $reply_to_own_comment = $comment->parent ? $watcher->equals(
$comment->parent->poster ) : 0;
+ if ( $watcher->equals( $entry->poster ) && ! ( $reply_to_own_comment
|| $watcher->prop( 'opt_getselfemail' ) ) ) {
+ return 0 if $entry->prop('opt_noemail') && $subscr->method =~
/Email$/;
+ }
}
# watching a specific journal
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Event/JournalNewEntry.pm
--- a/cgi-bin/LJ/Event/JournalNewEntry.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Event/JournalNewEntry.pm Thu Jun 24 15:05:56 2010 -0500
@@ -64,7 +64,7 @@ sub matches_filter {
return 1 if ! $subscr->journalid && $subscr->owner->watches(
$self->event_journal );
# a post on a specific journal
- return LJ::u_equals($subscr->journal, $evtju);
+ return $evtju->equals( $subscr->journal );
}
sub _can_view_content {
@@ -133,7 +133,7 @@ sub as_html {
my $url = $entry->url;
my $about = $entry->subject_text ? ' titled "' . $entry->subject_text .
'"' : '';
- my $where = LJ::u_equals($journal, $entry->poster) ? "$pu" : "$pu in $ju";
+ my $where = $journal->equals( $entry->poster ) ? "$pu" : "$pu in $ju";
return "New <a href=\"$url\">entry</a>$about by $where.";
}
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Event/UserMessageRecvd.pm
--- a/cgi-bin/LJ/Event/UserMessageRecvd.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Event/UserMessageRecvd.pm Thu Jun 24 15:05:56 2010 -0500
@@ -150,7 +150,7 @@ sub subscription_as_html {
# "Someone sends $user a message"
# "Someone sends me a message"
- return LJ::u_equals($journal, $subscr->owner) ?
+ return $journal->equals( $subscr->owner ) ?
BML::ml('event.user_message_recvd.me') :
BML::ml('event.user_message_recvd.user', { user =>
$journal->ljuser_display } );
}
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Event/UserNewEntry.pm
--- a/cgi-bin/LJ/Event/UserNewEntry.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Event/UserNewEntry.pm Thu Jun 24 15:05:56 2010 -0500
@@ -96,7 +96,7 @@ sub matches_filter {
# otherwise we have a journalid, see if it's the specific
# journal that the subscription is watching
- return LJ::u_equals($subscr->journal, $self->poster);
+ return $subscr->journal->equals( $self->poster );
}
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/Talk.pm
--- a/cgi-bin/LJ/Talk.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/Talk.pm Thu Jun 24 15:05:56 2010 -0500
@@ -2272,11 +2272,11 @@ sub _format_headers {
my ($headersubject, $fromname);
unless ($headersubject = $comment->{subject}) {
my $key = 'esn.mail_comments.subject.';
- if (LJ::u_equals($comment->{u}, $u)) {
+ if ( $comment->{u} && $comment->{u}->equals( $u ) ) {
$key .= 'comment_you_'. ($edited ? 'edited' : 'posted');
} else {
if ($parent->{talkid}) {
- if(LJ::u_equals($paru, $u)) {
+ if ( $paru && $paru->equals( $u ) ) {
$key .= ($edited ? 'edit_' : '') . 'reply_to_your_comment';
} else {
$key .= ($edited ? 'edit_' : '') . 'reply_to_a_comment';
@@ -2390,7 +2390,7 @@ sub mail_comments {
# same as the comment user
# is_diff_user: also so we don't auto-vivify $comment->{u}
my $is_diff_user = !$comment->{u} ||
- !LJ::u_equals( $paru, $comment->{u} );
+ ! $paru->equals( $comment->{u} );
if ($paru->{'opt_gettalkemail'} eq "Y" &&
$paru->is_visible &&
@@ -2464,7 +2464,7 @@ sub mail_comments {
if ($entryu->{'opt_gettalkemail'} eq "Y" &&
$entryu->is_visible &&
!$item->{props}->{'opt_noemail'} &&
- !LJ::u_equals($comment->{u}, $entryu) &&
+ !$entryu->equals( $comment->{u} ) &&
$entryu->email_raw ne $parentmailed &&
$entryu->{'status'} eq "A" &&
!$entryu->gets_notified(journal => $journalu, arg1 => $ditemid, arg2
=> $comment->{talkid})
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/LJ/User.pm Thu Jun 24 15:05:56 2010 -0500
@@ -2936,7 +2936,8 @@ sub display_name {
sub equals {
- return LJ::u_equals( @_ );
+ my ($u1, $u2) = @_;
+ return $u1 && $u2 && $u1->userid == $u2->userid;
}
@@ -6536,20 +6537,6 @@ sub mark_user_active {
# <LJFUNC>
-# name: LJ::u_equals
-# des: Compares two user objects to see if they are the same user.
-# args: userobj1, userobj2
-# des-userobj1: First user to compare.
-# des-userobj2: Second user to compare.
-# returns: Boolean, true if userobj1 and userobj2 are defined and have equal
userids.
-# </LJFUNC>
-sub u_equals {
- my ($u1, $u2) = @_;
- return $u1 && $u2 && $u1->userid == $u2->userid;
-}
-
-
-# <LJFUNC>
# name: LJ::want_user
# des: Returns user object when passed either userid or user object. Useful to
functions that
# want to accept either.
@@ -7895,7 +7882,7 @@ sub get_authas_list {
grep { ! $opts->{'type'} || $opts->{'type'} eq
$_->{'journaltype'} }
# unless overridden, hide non-visible/non-read-only journals.
always display the user's acct
- grep { $opts->{'showall'} || $_->is_visible || $_->is_readonly
|| LJ::u_equals($_, $u) }
+ grep { $opts->{'showall'} || $_->is_visible || $_->is_readonly
|| $_->equals( $u ) }
# can't work as an expunged account
grep { ! $_->is_expunged && $_->clusterid > 0 }
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/ljfeed.pl
--- a/cgi-bin/ljfeed.pl Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/ljfeed.pl Thu Jun 24 15:05:56 2010 -0500
@@ -376,7 +376,7 @@ sub create_view_rss
$ret .= " <lj:music>" . LJ::exml($it->{music}) . "</lj:music>\n" if
$it->{music};
$ret .= " <lj:mood>" . LJ::exml($it->{mood}) . "</lj:mood>\n" if
$it->{mood};
$ret .= " <lj:security>" . LJ::exml($it->{security}) .
"</lj:security>\n" if $it->{security};
- $ret .= " <lj:poster>" . LJ::exml($poster->user) . "</lj:poster>\n"
unless LJ::u_equals($u, $poster);
+ $ret .= " <lj:poster>" . LJ::exml($poster->user) . "</lj:poster>\n"
unless $u->equals( $poster );
$ret .= " <lj:reply-count>$it->{replycount}</lj:reply-count>\n";
$ret .= "</item>\n";
}
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/ljprotocol.pl
--- a/cgi-bin/ljprotocol.pl Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/ljprotocol.pl Thu Jun 24 15:05:56 2010 -0500
@@ -1105,7 +1105,7 @@ sub postevent
# must have a validated email address to post to a community
# unless this is approved from the mod queue (we'll error out initially,
but in case they change later)
return fail($err, 155, "You must have an authenticated email address in
order to post to another account")
- unless LJ::u_equals($u, $uowner) || $u->{'status'} eq 'A' ||
$flags->{'nomod'};
+ unless $u->equals( $uowner ) || $u->{'status'} eq 'A' ||
$flags->{'nomod'};
# post content too large
# NOTE: requires $req->{event} be binary data, but we've already
@@ -1590,7 +1590,7 @@ sub postevent
# cluster tracking
LJ::mark_user_active($u, 'post');
- LJ::mark_user_active($uowner, 'post') unless LJ::u_equals($u, $uowner);
+ LJ::mark_user_active($uowner, 'post') unless $u->equals( $uowner );
$res->{'itemid'} = $jitemid; # by request of mart
$res->{'anum'} = $anum;
diff -r 8311981630b7 -r 4cbbd2cbb6de cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl Thu Jun 24 22:53:11 2010 +0800
+++ b/cgi-bin/weblib.pl Thu Jun 24 15:05:56 2010 -0500
@@ -2705,7 +2705,7 @@ sub control_strip
$ret .= "</td>\n";
$ret .= "<td id='lj_controlstrip_actionlinks' nowrap='nowrap'>";
- if (LJ::u_equals($remote, $journal)) {
+ if ( $remote->equals( $journal ) ) {
if ( $view eq "read" ) {
$ret .= $statustext{'yourfriendspage'};
} elsif ( $view eq "network" ) {
@@ -2717,7 +2717,7 @@ sub control_strip
if ( $view eq "read" || $view eq "network" ) {
my @filters = ("all",
$BML::ML{'web.controlstrip.select.friends.all'}, "showpeople",
$BML::ML{'web.controlstrip.select.friends.journals'}, "showcommunities",
$BML::ML{'web.controlstrip.select.friends.communities'}, "showsyndicated",
$BML::ML{'web.controlstrip.select.friends.feeds'});
# content_filters returns an array of content filters this
user had, sorted by sortorder
- # since this is only shown if LJ::u_equals($remote, $journal)
, we don't have to care whether a filter is public or not
+ # since this is only shown if $remote->equals( $journal ) , we
don't have to care whether a filter is public or not
my @custom_filters = $journal->content_filters;
foreach my $f ( @custom_filters ) {
@@ -3305,7 +3305,7 @@ sub subscribe_interface {
my $evt_class = $pending_sub->event_class or next;
unless ($is_tracking_category) {
next unless eval {
$evt_class->subscription_applicable($pending_sub) };
- next if LJ::u_equals($journalu, $u) && $pending_sub->journalid
&& $pending_sub->journalid != $u->{userid};
+ next if $u->equals( $journalu ) && $pending_sub->journalid &&
$pending_sub->journalid != $u->{userid};
} else {
my $no_show = 0;
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/community/members.bml
--- a/htdocs/community/members.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/community/members.bml Thu Jun 24 15:05:56 2010 -0500
@@ -368,7 +368,7 @@ body<=
foreach my $id (keys %{$add{'member'}}) {
next if $was{$id}->{'member'};
my $u = LJ::load_userid($id);
- if (LJ::u_equals($u, $remote)) {
+ if ( $remote->equals( $u ) ) {
# you're allowed to add yourself as member
LJ::join_community($remote, $c);
} else {
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/manage/index.bml
--- a/htdocs/manage/index.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/manage/index.bml Thu Jun 24 15:05:56 2010 -0500
@@ -29,10 +29,10 @@ _c?>
if ( $u ) {
$u->preload_props( "stylesys" );
$u->{'stylesys'} ||= 2;
+ $BMLCodeBlock::authas = $u->equals( $remote ) ? "" : "?authas=$authas";
}
$BMLCodeBlock::u = $u;
- $BMLCodeBlock::authas = LJ::u_equals($u, $remote) ? "" : "?authas=$authas";
return;
}
_code?>
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/manage/subscriptions/user.bml
--- a/htdocs/manage/subscriptions/user.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/manage/subscriptions/user.bml Thu Jun 24 15:05:56 2010 -0500
@@ -37,7 +37,7 @@ body<=
my $journal = LJ::load_user($GET{journal}) or return LJ::bad_input("No
journal specified");
- return BML::redirect("$LJ::SITEROOT/manage/subscriptions/") if
LJ::u_equals($remote, $journal);
+ return BML::redirect("$LJ::SITEROOT/manage/subscriptions/") if
$remote->equals( $journal );
# what classes to display on this page
my $cat_title = 'Track User';
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/poll/create.bml
--- a/htdocs/poll/create.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/poll/create.bml Thu Jun 24 15:05:56 2010 -0500
@@ -89,7 +89,7 @@ _c?>
# If remote can't make polls, make sure they maintain the authas journal
if ($remote_can_make_polls) {
my $authas_u = LJ::load_user($authas);
- if ($authas_u and (LJ::u_equals($authas_u, $remote) or
LJ::check_rel($authas_u, $remote, 'P'))) {
+ if ($authas_u and ( $authas_u->equals( $remote ) or
LJ::check_rel($authas_u, $remote, 'P'))) {
$u = $authas_u;
}
} else {
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/talkpost.bml
--- a/htdocs/talkpost.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/talkpost.bml Thu Jun 24 15:05:56 2010 -0500
@@ -238,7 +238,7 @@ body<=
# who-wrote-where
{
- my $suffix = LJ::u_equals($ur, $u) ? "" : "_comm";
+ my $suffix = $u->equals( $ur ) ? "" : "_comm";
# user logged in
if ($ur) {
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/talkread.bml
--- a/htdocs/talkread.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/talkread.bml Thu Jun 24 15:05:56 2010 -0500
@@ -268,7 +268,7 @@ body<=
}
$ret .= "<td class='attrib' valign='bottom'>";
- if (!LJ::u_equals($u, $up)) {
+ unless ( $u->equals( $up ) ) {
$ret .= BML::ml("talk.somebodywrote_comm", { 'realname' =>
LJ::ehtml($up->{'name'}),
'userlink' =>
LJ::ljuser($up),
'commlink' =>
LJ::ljuser($u) });
diff -r 8311981630b7 -r 4cbbd2cbb6de htdocs/tools/recent_comments.bml
--- a/htdocs/tools/recent_comments.bml Thu Jun 24 22:53:11 2010 +0800
+++ b/htdocs/tools/recent_comments.bml Thu Jun 24 15:05:56 2010 -0500
@@ -119,7 +119,7 @@ body<=
unless grep { $count == $_ } @values;
push @values, $max
unless grep { $max == $_ } @values;
- my $getextra = LJ::u_equals($u, $remote) ? "" : "&authas=" . $u->user;
+ my $getextra = $u->equals( $remote ) ? "" : "&authas=" . $u->user;
@values = sort { $a <=> $b } @values;
diff -r 8311981630b7 -r 4cbbd2cbb6de t/esn-findsubscription.t
--- a/t/esn-findsubscription.t Thu Jun 24 22:53:11 2010 +0800
+++ b/t/esn-findsubscription.t Thu Jun 24 15:05:56 2010 -0500
@@ -176,7 +176,7 @@ test_subscription(sub {
journalid => $u2->{userid},
);
ok($subsc3, "Made subscription");
- ok(LJ::u_equals($subsc3->journal, $u2), "Subscribed to correct
journal");
+ ok( $u2->equals( $subsc3->journal ), "Subscribed to correct journal" );
my ($subsc3_f) = $u1->has_subscription(
event => "AddedToCircle",
);
diff -r 8311981630b7 -r 4cbbd2cbb6de t/uniqcookie.t
--- a/t/uniqcookie.t Thu Jun 24 22:53:11 2010 +0800
+++ b/t/uniqcookie.t Thu Jun 24 15:05:56 2010 -0500
@@ -35,7 +35,7 @@ sub run_tests {
$LJ::_T_UNIQCOOKIE_CURRENT_UNIQ = $uniq;
my $g_remote = $class->guess_remote;
- ok(LJ::u_equals($g_remote, $u), "guessed correct remote");
+ ok( $u->equals( $g_remote ), "guessed correct remote" );
}
{ # multiple uniqs, same user
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
