![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png){kind=small}
[dw-free] Migrate calls from LJ::DISABLED to LJ::is_enabled
[commit: http://hg.dwscoalition.org/dw-free/rev/824f806db3f2]
http://bugs.dwscoalition.org/show_bug.cgi?id=460
LJ::DISABLED to LJ::enabled, part 2
Patch by![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
kareila.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=460
LJ::DISABLED to LJ::enabled, part 2
Patch by
kareila.Files modified:
- cgi-bin/LJ/EmbedModule.pm
- cgi-bin/LJ/Event.pm
- cgi-bin/LJ/M/ProfilePage.pm
- cgi-bin/LJ/Portal/Box.pm
- cgi-bin/LJ/S2/EntryPage.pm
- cgi-bin/LJ/SMS.pm
- cgi-bin/LJ/UniqCookie.pm
- cgi-bin/LJ/User.pm
- cgi-bin/LJ/Userpic.pm
- cgi-bin/LJ/Widget/UserpicDisplay.pm
- cgi-bin/ljfeed.pl
- cgi-bin/ljlib.pl
- cgi-bin/weblib.pl
- htdocs/interests.bml
- htdocs/manage/index.bml
- htdocs/portal/get.bml
- htdocs/portal/ig.bml
- htdocs/portal/index.bml
- htdocs/portal/selectmodule.bml
- htdocs/talkread.bml
- htdocs/tools/endpoints/esn_subs.bml
- htdocs/tools/endpoints/widget.bml
--------------------------------------------------------------------------------
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/EmbedModule.pm
--- a/cgi-bin/LJ/EmbedModule.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/EmbedModule.pm Sat May 09 09:13:46 2009 +0000
@@ -103,7 +103,7 @@ sub parse_module_embed {
return unless $postref && $$postref;
- return if LJ::conf_test($LJ::DISABLED{embed_module});
+ return unless LJ::is_enabled('embed_module');
# fast track out if we don't have to expand anything
return unless $$postref =~ /lj\-embed|embed|object/i;
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/Event.pm
--- a/cgi-bin/LJ/Event.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/Event.pm Sat May 09 09:13:46 2009 +0000
@@ -460,7 +460,7 @@ sub template_file_for {
my $self = shift;
my %opts = @_;
- return if LJ::conf_test($LJ::DISABLED{template_files});
+ return unless LJ::is_enabled('template_files');
my $section = $opts{section};
my $lang = $opts{lang} || 'default';
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/M/ProfilePage.pm
--- a/cgi-bin/LJ/M/ProfilePage.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/M/ProfilePage.pm Sat May 09 09:13:46 2009 +0000
@@ -117,11 +117,11 @@ sub header_bar_links {
push @ret, "<a href='$LJ::SITEROOT/tools/memories.bml?user=$user'><img src='$LJ::IMGPREFIX/silk/profile/memories.png' width='16' height='16' alt='$label' title='$label' align='middle' border='0' /></a>";
}
- unless ($LJ::DISABLED{'tellafriend'} || $pm->{u}->is_identity) {
+ if ( LJ::is_enabled('tellafriend') && !$pm->{u}->is_identity ) {
push @ret, "<a href='$LJ::SITEROOT/tools/tellafriend.bml?user=$user'><img align='middle' hspace='2' vspace='2' src='$LJ::IMGPREFIX/silk/profile/tellafriend.png' width='16' height='16' alt='$BML::ML{'.tellafriend'}' title='$BML::ML{'.tellafriend'}' border='0' /></a>";
}
- unless ($LJ::DISABLED{'offsite_journal_search'} || ! $pm->has_journal) {
+ if ( LJ::is_enabled('offsite_journal_search') && $pm->has_journal ) {
push @ret, "<a href='$LJ::SITEROOT/tools/search.bml?journal=$user'><img align='middle' hspace='2' vspace='2' src='$LJ::IMGPREFIX/btn_search.gif' width='22' height='20' alt='$BML::ML{'.label.searchjournal'}' title='$BML::ML{'.label.searchjournal'}' border='0' /></a>";
}
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/Portal/Box.pm
--- a/cgi-bin/LJ/Portal/Box.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/Portal/Box.pm Sat May 09 09:13:46 2009 +0000
@@ -176,7 +176,7 @@ sub box_is_disabled {
my LJ::Portal::Box $self = shift;
my $type = $self->box_class;
- return $LJ::DISABLED{"portal-$type"} || 0;
+ return ! LJ::is_enabled("portal-$type");
}
# getter and setter
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/S2/EntryPage.pm
--- a/cgi-bin/LJ/S2/EntryPage.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/S2/EntryPage.pm Sat May 09 09:13:46 2009 +0000
@@ -290,14 +290,7 @@ sub EntryPage
# prepare the javascript data structure to put in the top of the page
# if the remote user is a manager of the comments
- my $do_commentmanage_js = $p->{'multiform_on'};
- if ($LJ::DISABLED{'commentmanage'}) {
- if (ref $LJ::DISABLED{'commentmanage'} eq "CODE") {
- $do_commentmanage_js = $LJ::DISABLED{'commentmanage'}->($remote);
- } else {
- $do_commentmanage_js = 0;
- }
- }
+ my $do_commentmanage_js = $p->{'multiform_on'} && LJ::is_enabled('commentmanage', $remote);
# print comment info
{
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/SMS.pm
--- a/cgi-bin/LJ/SMS.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/SMS.pm Sat May 09 09:13:46 2009 +0000
@@ -305,23 +305,8 @@ sub enqueue_as_incoming {
# -- $u can be undef, passed opaquely to coderef if sms_ui is coderef
sub can_use_sms {
my ($class, $u) = @_;
-
- # global flag, can't be coderef, turns e'rthang off
- return 0 if $LJ::DISABLED{sms};
-
- # ui disabling can be coderef or not... if there is
- # no config setting at all, it must be enabled for everyone
- my $disable = $LJ::DISABLED{sms_ui};
- return 1 unless $disable;
-
- # if a coderef, ask it if this given $u (can be undef)
- # can use SMS
- if (ref $disable eq 'CODE') {
- return $disable->($u) ? 0 : 1;
- }
-
- # sms_ui is a simple flag?
- return $disable ? 0 : 1;
+ return 0 unless LJ::is_enabled('sms');
+ return LJ::is_enabled('sms_ui', $u);
}
# is sms sending configured?
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/UniqCookie.pm
--- a/cgi-bin/LJ/UniqCookie.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/UniqCookie.pm Sat May 09 09:13:46 2009 +0000
@@ -213,7 +213,7 @@ sub is_disabled {
my $uniq = $class->current_uniq;
return 1 unless $LJ::UNIQ_COOKIES;
- return LJ::conf_test($LJ::DISABLED{uniq_mapping}, $remote, $uniq);
+ return ! LJ::is_enabled('uniq_mapping', $remote, $uniq);
}
sub guess_remote {
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/User.pm Sat May 09 09:13:46 2009 +0000
@@ -2004,7 +2004,7 @@ sub opt_showlocation {
$u->_lazy_migrate_infoshow;
# see comments for opt_showbday
- if ($LJ::DISABLED{infoshow_migrate} && $u->{allow_infoshow} ne ' ') {
+ unless ( LJ::is_enabled('infoshow_migrate') || $u->{allow_infoshow} eq ' ' ) {
return $u->{allow_infoshow} eq 'Y' ? undef : 'N';
}
if ($u->raw_prop('opt_showlocation') =~ /^(N|Y|R|F)$/) {
@@ -2779,7 +2779,7 @@ sub opt_showbday {
# fall through and show their prop value
# -- if user not migrated yet, we'll synthesize a prop
# value from infoshow without writing it
- if ($LJ::DISABLED{infoshow_migrate} && $u->{allow_infoshow} ne ' ') {
+ unless ( LJ::is_enabled('infoshow_migrate') || $u->{allow_infoshow} eq ' ' ) {
return $u->{allow_infoshow} eq 'Y' ? undef : 'N';
}
if ($u->raw_prop('opt_showbday') =~ /^(D|F|N|Y)$/) {
@@ -3970,7 +3970,7 @@ sub show_ljtalk {
# Fail if the user wants to hide the LJ Talk field on their profile,
# or doesn't even have the ability to show it.
- return 0 if $u->opt_showljtalk eq 'N' || $LJ::DISABLED{'ljtalk'} || !$u->is_person;
+ return 0 unless $u->opt_showljtalk eq 'Y' && LJ::is_enabled('ljtalk') && $u->is_person;
# User either decided to show LJ Talk field or has left it at the default.
return 1 if $u->opt_showljtalk eq 'Y';
@@ -4523,8 +4523,7 @@ sub subtract_sms_quota {
# Check to see if the user can use eboxes at all
sub can_use_ebox {
my $u = shift;
-
- return ref $LJ::DISABLED{ebox} ? !$LJ::DISABLED{ebox}->($u) : !$LJ::DISABLED{ebox};
+ return LJ::is_enabled('ebox', $u);
}
@@ -4713,15 +4712,8 @@ sub can_add_inbox_subscription {
# can this user use ESN?
sub can_use_esn {
my $u = shift;
- return 0 if $LJ::DISABLED{esn};
- my $disable = $LJ::DISABLED{esn_ui};
- return 1 unless $disable;
-
- if (ref $disable eq 'CODE') {
- return $disable->($u) ? 0 : 1;
- }
-
- return $disable ? 0 : 1;
+ return 0 unless LJ::is_enabled('esn');
+ return LJ::is_enabled('esn_ui', $u);
}
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/Userpic.pm
--- a/cgi-bin/LJ/Userpic.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/Userpic.pm Sat May 09 09:13:46 2009 +0000
@@ -749,7 +749,7 @@ sub create {
LJ::Userpic->delete_cache( $u );
my $upic = LJ::Userpic->new( $u, $picid ) or die "Error insantiating userpic";
- LJ::Event::NewUserpic->new( $upic )->fire unless $LJ::DISABLED{esn} || $nonotify;
+ LJ::Event::NewUserpic->new( $upic )->fire if LJ::is_enabled('esn') && !$nonotify;
return $upic;
}
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/LJ/Widget/UserpicDisplay.pm
--- a/cgi-bin/LJ/Widget/UserpicDisplay.pm Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/LJ/Widget/UserpicDisplay.pm Sat May 09 09:13:46 2009 +0000
@@ -35,7 +35,7 @@ sub render_body {
my $u = $user;
return "" unless $u;
- return "" if $LJ::DISABLED{userpicselect} && ! $u->get_cap('userpicselect');
+ return "" unless LJ::is_enabled('userpicselect') || $u->get_cap('userpicselect');
my $res;
$res = LJ::Protocol::do_request("login", {
@@ -176,7 +176,7 @@ sub render_body {
});
// ]]>
</script>
- } unless $LJ::DISABLED{userpicselect} || ! $u->get_cap('userpicselect');
+ } if LJ::is_enabled('userpicselect') && $u->get_cap('userpicselect');
$$pic .= "<div id='userpic' style='display: none;'><p id='userpic_preview'><a href='javascript:void(0);' id='lj_userpicselect_img'><img src='' alt='selected userpic' id='userpic_preview_image' /><span id='lj_userpicselect_img_txt'>$userpic_link_text</span></a></p></div>";
$$pic .= "\n";
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/ljfeed.pl
--- a/cgi-bin/ljfeed.pl Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/ljfeed.pl Sat May 09 09:13:46 2009 +0000
@@ -990,7 +990,7 @@ sub create_view_comments
{
my ($journalinfo, $u, $opts) = @_;
- if (LJ::conf_test($LJ::DISABLED{latest_comments_rss}, $u)) {
+ unless ( LJ::is_enabled('latest_comments_rss', $u) ) {
$opts->{handler_return} = 404;
return 404;
}
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/ljlib.pl
--- a/cgi-bin/ljlib.pl Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/ljlib.pl Sat May 09 09:13:46 2009 +0000
@@ -233,7 +233,7 @@ sub get_blob_domainid
}
sub _using_blockwatch {
- if (LJ::conf_test($LJ::DISABLED{blockwatch})) {
+ unless ( LJ::is_enabled('blockwatch') ) {
# Config override to disable blockwatch.
return 0;
}
@@ -1454,7 +1454,7 @@ sub start_request
js/esn.js
stc/esn.css
))
- unless LJ::conf_test($LJ::DISABLED{esn_ajax});
+ if LJ::is_enabled('esn_ajax');
# contextual popup JS
LJ::need_res(qw(
diff -r 1884eac7aca8 -r 824f806db3f2 cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl Sat May 09 09:00:17 2009 +0000
+++ b/cgi-bin/weblib.pl Sat May 09 09:13:46 2009 +0000
@@ -716,7 +716,7 @@ sub create_qr_div {
# userpic browse button
$qrhtml .= qq {
<input type="button" id="lj_userpicselect" value="Browse" />
- } unless $LJ::DISABLED{userpicselect} || ! $remote->get_cap('userpicselect');
+ } if LJ::is_enabled('userpicselect') && $remote->get_cap('userpicselect');
$qrhtml .= LJ::help_icon_html("userpics", " ");
}
@@ -839,7 +839,7 @@ sub create_qr_div {
}
});
</script>
- } unless $LJ::DISABLED{userpicselect} || ! $remote->get_cap('userpicselect');
+ } if LJ::is_enabled('userpicselect') && $remote->get_cap('userpicselect');
return $ret;
}
@@ -977,8 +977,8 @@ sub entry_form {
}
# Temp fix for FF 2.0.0.17
- my $rte_not_supported = LJ::conf_test($LJ::DISABLED{'rte_support'}, BML::get_client_header("User-Agent"));
- $opts->{'richtext_default'} = 0 if ($rte_not_supported);
+ my $rte_is_supported = LJ::is_enabled('rte_support', BML::get_client_header("User-Agent"));
+ $opts->{'richtext_default'} = 0 unless $rte_is_supported;
$opts->{'richtext'} = $opts->{'richtext_default'};
my $tabnum = 10; #make allowance for username and password
@@ -1135,7 +1135,7 @@ sub entry_form {
});
// ]]>
</script>
- } unless $LJ::DISABLED{userpicselect} || ! $remote->get_cap('userpicselect');
+ } if LJ::is_enabled('userpicselect') && $remote->get_cap('userpicselect');
# libs for userpicselect
LJ::need_res(qw(
@@ -1277,7 +1277,7 @@ sub entry_form {
'tabindex' => $tabindex->(),
'disabled' => $opts->{'disabled_save'}}) . "\n";
$out .= "<ul id='entry-tabs' style='display: none;'>\n";
- $out .= "<li id='jrich'>" . BML::ml("entryform.htmlokay.rich4", { 'opts' => 'href="javascript:void(0);" onclick="return useRichText(\'draft\', \'' . $LJ::WSTATPREFIX. '\');"' }) . "</li>\n" unless ($rte_not_supported);
+ $out .= "<li id='jrich'>" . BML::ml("entryform.htmlokay.rich4", { 'opts' => 'href="javascript:void(0);" onclick="return useRichText(\'draft\', \'' . $LJ::WSTATPREFIX. '\');"' }) . "</li>\n" if $rte_is_supported;
$out .= "<li id='jplain' class='on'>" . BML::ml("entryform.plainswitch2", { 'aopts' => 'href="javascript:void(0);" onclick="return usePlainText(\'draft\');"' }) . "</li>\n";
$out .= "</ul>";
$out .= "</div><!-- end #entry -->\n\n";
@@ -2216,13 +2216,13 @@ sub res_includes {
$ctxpopup = 0 if $remote && ! $remote->prop("opt_ctxpopup");
# poll for esn inbox updates?
- my $inbox_update_poll = $LJ::DISABLED{inbox_update_poll} ? 0 : 1;
+ my $inbox_update_poll = LJ::is_enabled('inbox_update_poll');
# are media embeds enabled?
- my $embeds_enabled = $LJ::DISABLED{embed_module} ? 0 : 1;
+ my $embeds_enabled = LJ::is_enabled('embed_module');
# esn ajax enabled?
- my $esn_async = LJ::conf_test($LJ::DISABLED{esn_ajax}) ? 0 : 1;
+ my $esn_async = LJ::is_enabled('esn_ajax');
my %site = (
imgprefix => "$imgprefix",
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/interests.bml
--- a/htdocs/interests.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/interests.bml Sat May 09 09:13:46 2009 +0000
@@ -450,7 +450,7 @@ body<=
my $count = @cl;
my $list;
- my $show_comm_promos = !LJ::conf_test($LJ::DISABLED{"community_themes"});
+ my $show_comm_promos = LJ::is_enabled('community_themes');
foreach (@cl) {
my $name = $_->{name};
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/manage/index.bml
--- a/htdocs/manage/index.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/manage/index.bml Sat May 09 09:13:46 2009 +0000
@@ -195,8 +195,8 @@ _code?>
return '' if $u->{'journaltype'} eq 'I';
my $authas = ref $u ? "?authas=$u->{user}" : "";
- return $LJ::DISABLED{tags} ? "" :
- "<li><a href='/manage/tags.bml$authas' title='<?_ml .entries.tags.about _ml?>'><?_ml .entries.tags.header _ml?></a></li>";
+ return '' unless LJ::is_enabled('tags');
+ return "<li><a href='/manage/tags.bml$authas' title='<?_ml .entries.tags.about _ml?>'><?_ml .entries.tags.header _ml?></a></li>";
_code?>
<=list
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/portal/get.bml
--- a/htdocs/portal/get.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/portal/get.bml Sat May 09 09:13:46 2009 +0000
@@ -4,20 +4,12 @@
use vars qw(%FORM $head $body);
use LJ::Portal::Config;
- my $disabled = $LJ::DISABLED{'portal'};
-
my $remote = LJ::get_remote();
- if (ref $disabled eq "CODE") {
- $disabled = $disabled->($remote);
- }
-
- if ($disabled) {
+ unless ( LJ::is_enabled('portal', $remote) ) {
$body = 'Sorry, the portal is disabled at this time.';
return;
}
-
- my $remote = LJ::get_remote;
# browser caching causes lots of issues
$head = '<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">';
@@ -55,7 +47,7 @@
# fading special effects?
my $doFadeDefault = 1;
- my $doFade = $LJ::DISABLED{'portal_fade'} ? 0 : $doFadeDefault;
+ my $doFade = LJ::is_enabled('portal_fade') && $doFadeDefault;
# parameters for portal.js
$head .= qq{
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/portal/ig.bml
--- a/htdocs/portal/ig.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/portal/ig.bml Sat May 09 09:13:46 2009 +0000
@@ -21,15 +21,9 @@
};
};
- my $disabled = $LJ::DISABLED{'portal'};
-
my $remote = LJ::get_remote();
- if (ref $disabled eq "CODE") {
- $disabled = $disabled->($remote);
- }
-
- if ($disabled) {
+ unless ( LJ::is_enabled('portal', $remote) ) {
return $returncontent->('Sorry, the portal is disabled at this time.');
}
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/portal/index.bml
--- a/htdocs/portal/index.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/portal/index.bml Sat May 09 09:13:46 2009 +0000
@@ -4,21 +4,13 @@
use vars qw($title $body $bodyopts $head %GET %POST);
use LJ::Portal::Config;
- my $disabled = $LJ::DISABLED{'portal'};
-
my $remote = LJ::get_remote();
- if (ref $disabled eq "CODE") {
- $disabled = $disabled->($remote);
- }
-
- if ($disabled) {
+ unless ( LJ::is_enabled('portal', $remote) ) {
$title = 'Disabled';
$body = 'Sorry, the portal is disabled at this time.';
return;
}
-
- my $remote = LJ::get_remote;
$title = BML::ml('.pagetitle', { 'sitenameabbrev' => $LJ::SITENAMEABBREV });
$body = '';
@@ -71,7 +63,7 @@
# fading special effects?
my $doFadeDefault = 1;
- my $doFade = $LJ::DISABLED{'portal_fade'} ? 0 : $doFadeDefault;
+ my $doFade = LJ::is_enabled('portal_fade') && $doFadeDefault;
# parameters for portal.js
$head .= qq{
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/portal/selectmodule.bml
--- a/htdocs/portal/selectmodule.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/portal/selectmodule.bml Sat May 09 09:13:46 2009 +0000
@@ -4,20 +4,12 @@
use vars qw(%FORM $head $body);
use LJ::Portal::Config;
- my $disabled = $LJ::DISABLED{'portal'};
-
my $remote = LJ::get_remote();
- if (ref $disabled eq "CODE") {
- $disabled = $disabled->($remote);
- }
-
- if ($disabled) {
+ unless ( LJ::is_enabled('portal', $remote) ) {
$body = 'Sorry, the portal is disabled at this time.';
return;
}
-
- my $remote = LJ::get_remote;
# browser caching causes lots of issues
$head = '<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">';
@@ -55,7 +47,7 @@
# fading special effects?
my $doFadeDefault = 1;
- my $doFade = $LJ::DISABLED{'portal_fade'} ? 0 : $doFadeDefault;
+ my $doFade = LJ::is_enabled('portal_fade') && $doFadeDefault;
# parameters for portal.js
$head .= qq{
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/talkread.bml
--- a/htdocs/talkread.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/talkread.bml Sat May 09 09:13:46 2009 +0000
@@ -211,7 +211,7 @@ body<=
stc/lj_base.css
js/datasource.js
js/selectable_table.js
- )) unless $LJ::DISABLED{userpicselect} || ! $remote->get_cap('userpicselect');
+ )) if LJ::is_enabled('userpicselect') && $remote->get_cap('userpicselect');
LJ::need_res(qw(
js/x_core.js
@@ -798,14 +798,7 @@ body<=
{
$recurse_post->($recurse_post, $_, { "depth" => 0 }) foreach (@comments);
- my $do_commentmanage_js = 1;
- if ($LJ::DISABLED{'commentmanage'}) {
- if (ref $LJ::DISABLED{'commentmanage'} eq "CODE") {
- $do_commentmanage_js = $LJ::DISABLED{'commentmanage'}->($remote);
- } else {
- $do_commentmanage_js = 0;
- }
- }
+ my $do_commentmanage_js = LJ::is_enabled('commentmanage', $remote);
if ($do_commentmanage_js) {
LJ::need_res('js/commentmanage.js');
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/tools/endpoints/esn_subs.bml
--- a/htdocs/tools/endpoints/esn_subs.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/tools/endpoints/esn_subs.bml Sat May 09 09:13:46 2009 +0000
@@ -18,7 +18,7 @@
});
};
- return $err->("Sorry async ESN is not enabled") if LJ::conf_test($LJ::DISABLED{esn_ajax});
+ return $err->("Sorry async ESN is not enabled") unless LJ::is_enabled('esn_ajax');
# get user
my $remote = LJ::get_remote()
diff -r 1884eac7aca8 -r 824f806db3f2 htdocs/tools/endpoints/widget.bml
--- a/htdocs/tools/endpoints/widget.bml Sat May 09 09:00:17 2009 +0000
+++ b/htdocs/tools/endpoints/widget.bml Sat May 09 09:13:46 2009 +0000
@@ -22,7 +22,7 @@
BML::noparse();
return $err->("Sorry widget AJAX is not enabled")
- if LJ::conf_test($LJ::DISABLED{widget_ajax});
+ unless LJ::is_enabled('widget_ajax');
my $remote = LJ::get_remote();
--------------------------------------------------------------------------------