diff --git a/include/security.php b/include/security.php index 078f47d70..6e722d673 100644 --- a/include/security.php +++ b/include/security.php @@ -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), diff --git a/mod/profile.php b/mod/profile.php index 263d7f80b..f442c73f5 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -263,16 +263,16 @@ function profile_content(&$a, $update = 0) { } } - // check if we serve a mobile device and get the user settings + // check if we serve a mobile device and get the user settings // accordingly - if ($a->is_mobile) { + if ($a->is_mobile) { $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network'); $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20); - } else { + } else { $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); } - // now that we have the user settings, see if the theme forces + // now that we have the user settings, see if the theme forces // a maximum item number which is lower then the user choice if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) $itemspage_network = $a->force_max_items; @@ -294,7 +294,6 @@ function profile_content(&$a, $update = 0) { intval($a->profile['profile_uid']) ); - } $parents_arr = array(); diff --git a/mod/search.php b/mod/search.php index 032dc17e1..c7387c516 100644 --- a/mod/search.php +++ b/mod/search.php @@ -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)));