keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Corrected "attag" query

Browse source
This commit is contained in:
Michael 2018-01-22 21:59:27 +00:00
parent 812cb3b174
commit 87db789e98
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mod/item.php
View file

@ -951,7 +951,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
// Try to detect the contact in various ways // Try to detect the contact in various ways
if (strpos($name, 'http://')) { if (strpos($name, 'http://')) {
// At first we have to ensure that the contact exists // At first we have to ensure that the contact exists
$id = Contact::getIdForURL($name); Contact::getIdForURL($name);
// Now we should have something // Now we should have something
$contact = Contact::getDetailsByURL($name); $contact = Contact::getDetailsByURL($name);
@ -968,25 +968,26 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
$contact = dba::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]); $contact = dba::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
} }
// select someone by nick and the name passed in the current network // select someone by nick or attag in the current network
if (!DBM::is_result($contact) && ($network != "")) { if (!DBM::is_result($contact) && ($network != "")) {
$condition = ['nick' => $name, 'network' => $network, 'uid' => $profile_uid]; $condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
$name, $name, $network, $profile_uid];
$contact = dba::selectFirst('contact', $fields, $condition); $contact = dba::selectFirst('contact', $fields, $condition);
} }
//select someone from this user's contacts by name in the current network //select someone by name in the current network
if (!DBM::is_result($contact) && ($network != "")) { if (!DBM::is_result($contact) && ($network != "")) {
$condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid]; $condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
$contact = dba::selectFirst('contact', $fields, $condition); $contact = dba::selectFirst('contact', $fields, $condition);
} }
// select someone by nick in any network // select someone by nick or attag in any network
if (!DBM::is_result($contact)) { if (!DBM::is_result($contact)) {
$condition = ['nick' => $name, 'uid' => $profile_uid]; $condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
$contact = dba::selectFirst('contact', $fields, $condition); $contact = dba::selectFirst('contact', $fields, $condition);
} }
// select someone from this user's contacts by name // select someone by name in any network
if (!DBM::is_result($contact)) { if (!DBM::is_result($contact)) {
$condition = ['name' => $name, 'uid' => $profile_uid]; $condition = ['name' => $name, 'uid' => $profile_uid];
$contact = dba::selectFirst('contact', $fields, $condition); $contact = dba::selectFirst('contact', $fields, $condition);