diff options
| author | friendica <info@friendica.com> | 2013-03-21 18:25:41 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-03-21 18:25:41 -0700 |
| commit | ddf5bf8968a12501939cd37898d303967b748600 (patch) | |
| tree | 9ec457948c7fadae811b1af676257c43bab93d4c /mod/community.php | |
| parent | b3c699d49a5ef2023fcbdaa8226be95fce9589a7 (diff) | |
| download | volse-hubzilla-ddf5bf8968a12501939cd37898d303967b748600.tar.gz volse-hubzilla-ddf5bf8968a12501939cd37898d303967b748600.tar.bz2 volse-hubzilla-ddf5bf8968a12501939cd37898d303967b748600.zip | |
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
Diffstat (limited to 'mod/community.php')
| -rw-r--r-- | mod/community.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/community.php b/mod/community.php index 4f6c3d3c9..971ecca5c 100644 --- a/mod/community.php +++ b/mod/community.php @@ -47,7 +47,7 @@ function community_content(&$a, $update = 0) { // OR your own posts if you are a logged in member if(! get_pconfig(local_user(),'system','alt_pager')) { - $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total` + $r = q("SELECT COUNT(distinct(`item`.`mid`)) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' @@ -66,7 +66,7 @@ function community_content(&$a, $update = 0) { } - $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, + $r = q("SELECT distinct(`item`.`mid`), `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, @@ -77,7 +77,7 @@ function community_content(&$a, $update = 0) { AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`mid` ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']) |