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

Removing and adding some indexes

Browse source
This commit is contained in:
Michael 2017-01-05 13:16:27 +00:00
parent 9c7a2d2f9a
commit 7aaf91a620
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/dbstructure.php
View file

@ -589,10 +589,8 @@ function db_definition($charset) {
"uid" => array("uid"), "uid" => array("uid"),
"uid_self" => array("uid", "self"), "uid_self" => array("uid", "self"),
"uid_network_batch_archive" => array("uid", "network", "batch(64)", "archive"), "uid_network_batch_archive" => array("uid", "network", "batch(64)", "archive"),
"uid_network" => array("uid", "network"),
"addr_uid" => array("addr(32)", "uid"), "addr_uid" => array("addr(32)", "uid"),
"nurl_uid" => array("nurl(32)", "uid"), "nurl_uid" => array("nurl(32)", "uid"),
"url_uid" => array("url(32)", "uid"),
"nick_uid" => array("nick(32)", "uid"), "nick_uid" => array("nick(32)", "uid"),
) )
); );
@ -1022,7 +1020,7 @@ function db_definition($charset) {
// "guid" => array("guid"), // "guid" => array("guid"),
"convid" => array("convid"), "convid" => array("convid"),
// "reply" => array("reply"), // "reply" => array("reply"),
"uri" => array("uri"), "uri" => array("uri(64)"),
"parent-uri" => array("parent-uri(64)"), "parent-uri" => array("parent-uri(64)"),
) )
); );

14
include/redir.php
View file

@ -27,13 +27,13 @@ function auto_redir(&$a, $contact_nick) {
$baseurl = substr($baseurl, $domain_st + 3); $baseurl = substr($baseurl, $domain_st + 3);
$nurl = normalise_link($baseurl); $nurl = normalise_link($baseurl);
/// @todo Why is there a query for "nurl" *and* "nurl"? Especially this normalising is strange.
$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) $r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
AND nick = '%s' AND self = 0 AND ( url LIKE '%%%s%%' or nurl LIKE '%%%s%%' ) AND blocked = 0 AND pending = 0 LIMIT 1", AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
dbesc($contact_nick), dbesc($contact_nick),
dbesc($a->user['nickname']), dbesc($a->user['nickname']),
dbesc($baseurl), dbesc($baseurl),
dbesc($nurl) dbesc($nurl)
); );
if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) { if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {