Permalink
Browse files

(bug 4718) Undoes previous change to allow people to import more icon…

…s than they have slots for.
  • Loading branch information...
1 parent ceffb6f commit d95af4fa69f5b6f099483544fcb8aae1e992b43e @rahaeli rahaeli committed Oct 16, 2012
Showing with 2 additions and 6 deletions.
  1. +2 −2 cgi-bin/DW/Worker/ContentImporter/Local/Userpics.pm
  2. +0 −4 doc/config-local.pl.txt
View
4 cgi-bin/DW/Worker/ContentImporter/Local/Userpics.pm
@@ -46,7 +46,7 @@ sub import_userpics {
$log ||= sub { undef };
my $count = $u->get_userpic_count;
- my $max = $LJ::IMPORT_OVERRIDE_USERPICS || $u->userpic_quota;
+ my $max = $u->userpic_quota;
my $left = $max - $count;
my $pending = scalar( @{$upics || [] } );
@@ -151,7 +151,7 @@ sub import_userpic {
$ret = 1;
my $count = $u->get_userpic_count;
- my $max = $LJ::IMPORT_OVERRIDE_USERPICS || $u->userpic_quota;
+ my $max = $u->userpic_quota;
if ( $count >= $max ) {
push @$errors, "Icon '$identifier': You are at your limit of $max " . ($max == 1 ? "userpic" : "userpics") .
View
4 doc/config-local.pl.txt
@@ -126,10 +126,6 @@
$COMMENT_IMPORT_MAX = undef;
$COMMENT_IMPORT_ERROR = "Importing more than 10,000 comments is currently disabled.";
- # Uncomment and set this value if you want to allow anybody to import as many userpics
- # as they can. Otherwise, we obey the quota their account type has.
- #$IMPORT_OVERRIDE_USERPICS = 500;
-
}
1;

0 comments on commit d95af4f

Please sign in to comment.