[livejournal] r17860: Minor bugfixes here and there

U   trunk/cgi-bin/Apache/LiveJournal.pm
U   trunk/htdocs/tools/endpoints/multisearch.bml

Modified: trunk/cgi-bin/Apache/LiveJournal.pm
===================================================================
--- trunk/cgi-bin/Apache/LiveJournal.pm	2010-12-03 10:49:38 UTC (rev 17859)
+++ trunk/cgi-bin/Apache/LiveJournal.pm	2010-12-03 23:48:14 UTC (rev 17860)
@@ -336,7 +336,7 @@
               # apply sysban block if applicable
               if (LJ::UniqCookie->sysban_should_block) {
                   LJ::Request->handler("perl-script");
-                  LJ::Reiquest->set_handlers(PerlHandler => \&blocked_bot );
+                  LJ::Request->set_handlers(PerlHandler => \&blocked_bot );
                   return LJ::Request::OK;
               }
           }

Modified: trunk/htdocs/tools/endpoints/multisearch.bml
===================================================================
--- trunk/htdocs/tools/endpoints/multisearch.bml	2010-12-03 10:49:38 UTC (rev 17859)
+++ trunk/htdocs/tools/endpoints/multisearch.bml	2010-12-03 23:48:14 UTC (rev 17860)
@@ -54,17 +54,12 @@
     if ($type eq "email") {
         my $email = lc($q);
         my $dbr = LJ::get_db_reader();
-        my $uids_ref = $dbr->selectall_arrayref("SELECT userid FROM user WHERE journaltype='P' AND statusvis='V' ".
-                                        "AND email=? LIMIT $max_users", undef, $email);
-        # try the email table
-        unless (@$uids_ref) {
-            $uids_ref = $dbr->selectall_arrayref(qq{
+        my $uids_ref = $dbr->selectall_arrayref(qq{
                 SELECT e.userid
                 FROM user u, email e
                 WHERE e.email=? AND e.userid=u.userid AND u.journaltype='P' AND u.statusvis='V'
                 LIMIT $max_users
             }, undef, $email);
-        }
 
         my %ret = ( status => 'success', result => '' );