Imports job addresses (Closes #1149).

[platal.git] / classes / userfilter.php

diff --git a/classes/userfilter.php b/classes/userfilter.php
index bc106cf..035ee25 100644 (file)
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -1048,7 +1048,7 @@ class UFC_Networking implements UserFilterCondition
         $conds = array();
         $conds[] = $sub . '.address ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->value);
         if ($this->type != -1) {
-            $conds[] = $sub . '.network_type = ' . XDB::format('{?}', $this->type);
+            $conds[] = $sub . '.nwid = ' . XDB::format('{?}', $this->type);
         }
         return implode(' AND ', $conds);
     }
@@ -1420,6 +1420,12 @@ class UFO_Score extends UserFilterOrder
     {
         $toks = $uf->getNameTokens();
         $scores = array();
+
+        // If there weren't any sort tokens, we shouldn't sort by score, sort by NULL instead
+        if (count($toks) == 0) {
+            return 'NULL';
+        }
+
         foreach ($toks as $sub => $token) {
             $scores[] = XDB::format('SUM(' . $sub . '.score + IF (' . $sub . '.token = {?}, 5, 0) )', $token);
         }
@@ -1795,7 +1801,7 @@ class UserFilter extends PlFilter
 
     public function getUID($pos = 0)
     {
-        $uids =$this->getUIDList(null, new PlFilter(1, $pos));
+        $uids =$this->getUIDList(null, new PlLimit(1, $pos));
         if (count($uids) == 0) {
             return null;
         } else {
@@ -1811,7 +1817,7 @@ class UserFilter extends PlFilter
 
     public function getPID($pos = 0)
     {
-        $pids =$this->getPIDList(null, new PlFilter(1, $pos));
+        $pids =$this->getPIDList(null, new PlLimit(1, $pos));
         if (count($pids) == 0) {
             return null;
         } else {