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

Merge pull request #4561 from MrPetovan/bug/fix-vier-messageto-select

Browse source 
Fix wrong SQL query syntax in Core\ACL
This commit is contained in:
Tobias Diekershoff 2018-03-08 11:18:56 +01:00 committed by GitHub
commit 1ab09dbcbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/ACL.php
View file

@ -180,7 +180,7 @@ class ACL extends BaseObject
$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n"; $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n";
$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact` $stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
$sql_extra $sql_extra
ORDER BY `name` ASC ", intval(local_user()) ORDER BY `name` ASC ", intval(local_user())
); );

2
src/Core/Protocol.php
View file

@ -119,6 +119,6 @@ class Protocol
*/ */
public static function formatMention($profile_url, $display_name) public static function formatMention($profile_url, $display_name)
{ {
return $display_name . '(' . self::getAddrFromProfileUrl($profile_url) . ')'; return $display_name . ' (' . self::getAddrFromProfileUrl($profile_url) . ')';
} }
} }