diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-10-16 21:37:14 +0200 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-10-16 21:37:14 +0200 |
| commit | e425def2a2d81dc39e113a343eeab51764ce1163 (patch) | |
| tree | 6535fba49d62e8ba504d73d4623616118ee3ec73 /mod | |
| parent | 6867a8a7f6060c82cba3a34cd944a3737e8e263e (diff) | |
| parent | 865f804cfb86f12573ece550e1a7cf28172f6749 (diff) | |
| download | volse-hubzilla-e425def2a2d81dc39e113a343eeab51764ce1163.tar.gz volse-hubzilla-e425def2a2d81dc39e113a343eeab51764ce1163.tar.bz2 volse-hubzilla-e425def2a2d81dc39e113a343eeab51764ce1163.zip | |
Merge branch 'master' of https://github.com/pafcu/red
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/events.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mod/events.php b/mod/events.php index c80d1dd39..d24f84d44 100755 --- a/mod/events.php +++ b/mod/events.php @@ -582,6 +582,7 @@ function events_content(&$a) { '$t_orig' => $t_orig, '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, + '$permissions' => t('Permissions'), '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)), '$submit' => t('Submit') diff --git a/mod/photos.php b/mod/photos.php index dc593f22b..2b859b7f1 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -999,7 +999,7 @@ function photos_content(&$a) { $comments = ''; if(! count($r)) { if($can_post || $can_comment) { - $comments .= replace_macros($cmnt_tpl,array( + $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$mode' => 'photos', '$jsreload' => $return_url, @@ -1070,7 +1070,7 @@ function photos_content(&$a) { $body_e = prepare_text($item['body'],$item['mimetype']); $comments .= replace_macros($template,array( - '$id' => $item['item_id'], + '$id' => $item['id'], '$mode' => 'photos', '$profile_url' => $profile_link, '$name' => $name_e, @@ -1079,7 +1079,7 @@ function photos_content(&$a) { '$title' => $title_e, '$body' => $body_e, '$ago' => relative_date($item['created']), - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''), '$drop' => $drop, '$comment' => $comment )); @@ -1087,7 +1087,7 @@ function photos_content(&$a) { } if($can_post || $can_comment) { - $comments .= replace_macros($cmnt_tpl,array( + $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$jsreload' => $return_url, '$type' => 'wall-comment', @@ -1129,6 +1129,7 @@ function photos_content(&$a) { '$like' => $like_e, '$dislike' => $dislike_e, '$comments' => $comments, + '$commentbox' => $commentbox, '$paginate' => $paginate, )); |