projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makes the $limit argument optional.
[platal.git]
/
classes
/
pluser.php
diff --git
a/classes/pluser.php
b/classes/pluser.php
index
4cd8edc
..
a87b5ac
100644
(file)
--- a/
classes/pluser.php
+++ b/
classes/pluser.php
@@
-151,11
+151,6
@@
abstract class PlUser
return $this->full_name;
}
return $this->full_name;
}
- public function promo()
- {
- return $this->promo;
- }
-
abstract public function password();
// Fallback value is GENDER_MALE.
abstract public function password();
// Fallback value is GENDER_MALE.
@@
-293,7
+288,7
@@
abstract class PlUser
public static function getSilentWithUID($uid)
{
public static function getSilentWithUID($uid)
{
- return User::getWithValues(
$uid
, array('User', '_silent_user_callback'));
+ return User::getWithValues(
null, array('user_id' => $uid)
, array('User', '_silent_user_callback'));
}
/**
}
/**
@@
-329,7
+324,7
@@
abstract class PlUser
if (($user = User::get($login, $callback))) {
$list[$i] = $user->$property();
if (($user = User::get($login, $callback))) {
$list[$i] = $user->$property();
- } else if (!$strict ||
User::isForeignEmailAddress($login
)) {
+ } else if (!$strict ||
(User::isForeignEmailAddress($login) && isvalid_email($login)
)) {
$list[$i] = $login;
}
}
$list[$i] = $login;
}
}