diff options
| -rw-r--r-- | mod/dfrn_poll.php | 4 | ||||
| -rw-r--r-- | mod/display.php | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 77beabf90..5149dc3b2 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -489,10 +489,6 @@ function dfrn_poll_content(&$a) { dbesc($session_id) ); } -<<<<<<< HEAD -======= - ->>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485 goaway($dest); } diff --git a/mod/display.php b/mod/display.php index eddaf8aaf..f74137e0e 100644 --- a/mod/display.php +++ b/mod/display.php @@ -264,6 +264,7 @@ function display_content(&$a) { '$to' => t('to'), '$wall' => t('Wall-to-Wall'), '$vwall' => t('via Wall-To-Wall:'), + '$item_photo_menu' => item_photo_menu($item), '$profile_url' => $profile_link, '$name' => $profile_name, '$sparkle' => $sparkle, |