Merge pull request #3353 from annando/1704-empty-contacts
Handle the case when the given contact url or address is empty
This commit is contained in:
commit
f1aed292db
1 changed files with 12 additions and 0 deletions
|
@ -212,6 +212,10 @@ function unmark_for_death($contact) {
|
|||
function get_contact_details_by_url($url, $uid = -1, $default = array()) {
|
||||
static $cache = array();
|
||||
|
||||
if ($url == '') {
|
||||
return $default;
|
||||
}
|
||||
|
||||
if ($uid == -1) {
|
||||
$uid = local_user();
|
||||
}
|
||||
|
@ -328,6 +332,10 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
|
|||
function get_contact_details_by_addr($addr, $uid = -1) {
|
||||
static $cache = array();
|
||||
|
||||
if ($addr == '') {
|
||||
return array();
|
||||
}
|
||||
|
||||
if ($uid == -1) {
|
||||
$uid = local_user();
|
||||
}
|
||||
|
@ -534,6 +542,10 @@ function get_contact($url, $uid = 0, $no_update = false) {
|
|||
$data = array();
|
||||
$contact_id = 0;
|
||||
|
||||
if ($url == '') {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// We first try the nurl (http://server.tld/nick), most common case
|
||||
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
|
||||
WHERE `nurl` = '%s'
|
||||
|
|
Loading…
Reference in a new issue