diff options
| author | Friendika <info@friendika.com> | 2011-04-04 01:22:05 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-04 01:22:05 -0700 |
| commit | 379af2521559c263622348bce41872b61067e532 (patch) | |
| tree | 1e082da12910b6e7ee187c64a2f8ade50479516b /mod/dfrn_poll.php | |
| parent | b5bcf44354410e2c37d5ec143c7050c3903200ed (diff) | |
| parent | 890753e5b545ca5777c6c9084e99cacf42a3b485 (diff) | |
| download | volse-hubzilla-379af2521559c263622348bce41872b61067e532.tar.gz volse-hubzilla-379af2521559c263622348bce41872b61067e532.tar.bz2 volse-hubzilla-379af2521559c263622348bce41872b61067e532.zip | |
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
Conflicts:
mod/dfrn_poll.php
Diffstat (limited to 'mod/dfrn_poll.php')
| -rw-r--r-- | mod/dfrn_poll.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 4b25efe41..77beabf90 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -445,7 +445,7 @@ function dfrn_poll_content(&$a) { 'sec' => $sec )); } - + $profile = $r[0]['nickname']; switch($destination_url) { @@ -489,6 +489,10 @@ function dfrn_poll_content(&$a) { dbesc($session_id) ); } +<<<<<<< HEAD +======= + +>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485 goaway($dest); } |