diff options
| author | friendica <info@friendica.com> | 2012-10-01 18:02:11 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-10-01 18:02:11 -0700 |
| commit | 846a9813b23911ae2a87d87fb6fd9f188ed84dc0 (patch) | |
| tree | a8a78b379cc8f4e25812c5b2cac603c86b6b1472 /view/theme/diabook | |
| parent | d261fe271fdee747244c76f7ba4679b8372a2e8c (diff) | |
| download | volse-hubzilla-846a9813b23911ae2a87d87fb6fd9f188ed84dc0.tar.gz volse-hubzilla-846a9813b23911ae2a87d87fb6fd9f188ed84dc0.tar.bz2 volse-hubzilla-846a9813b23911ae2a87d87fb6fd9f188ed84dc0.zip | |
here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers.
Diffstat (limited to 'view/theme/diabook')
| -rw-r--r-- | view/theme/diabook/theme.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 5c316e8ec..69bf51aa2 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -566,7 +566,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } break; default: - if ($rr['resource-id']){ + if ($rr['resource_id']){ $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); $rr['plink'] = $m[1]; @@ -584,11 +584,11 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if($close_lastphotos != "1") { $aside['$photos_title'] = t('Last photos'); $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` + $r = q("SELECT `photo`.`id`, `photo`.`resource_id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM + (SELECT `resource_id`, MAX(`scale`) as maxscale FROM `photo` WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, + AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource_id`) AS `t1` + INNER JOIN `photo` ON `photo`.`resource_id`=`t1`.`resource_id` AND `photo`.`scale` = `t1`.`maxscale`, `user` WHERE `user`.`uid` = `photo`.`uid` AND `user`.`blockwall`=0 @@ -601,8 +601,8 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if(count($r)) { $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; + $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource_id']; + $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] .'.jpg'; $entry = replace_macros($tpl,array( '$id' => $rr['id'], |