Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server

This commit is contained in:
Michael 2017-03-04 10:33:43 +00:00
commit ec9dddb445

View file

@ -276,7 +276,7 @@ function profile_content(App $a, $update = 0) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
FROM `thread`
FROM `thread` USE INDEX (`uid_wall_created`)
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
$sql_post_table
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`