kopia lustrzana https://github.com/friendica/friendica
Fixing SQL problem and speeding up search.
rodzic
69b7ad2450
commit
8392217b72
|
@ -310,9 +310,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
|
|||
dbesc($gs),
|
||||
dbesc($gs)
|
||||
*/
|
||||
" AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND wall = 1
|
||||
" AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1
|
||||
AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s')
|
||||
AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '')))))
|
||||
AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = '')))))
|
||||
",
|
||||
intval($remote_user),
|
||||
dbesc($gs),
|
||||
|
|
|
@ -294,7 +294,6 @@ function profile_content(&$a, $update = 0) {
|
|||
intval($a->profile['profile_uid'])
|
||||
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
$parents_arr = array();
|
||||
|
|
|
@ -133,7 +133,7 @@ function search_content(&$a) {
|
|||
$sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
|
||||
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
|
||||
|
||||
$sql_order = "`item`.`received`";
|
||||
$sql_order = "`item`.`id`";
|
||||
} else {
|
||||
if (get_config('system','use_fulltext_engine')) {
|
||||
$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
|
||||
|
|
Ładowanie…
Reference in New Issue