From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 08:22:05 +0000 (-0700)
Subject: Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=379af2521559c263622348bce41872b61067e532;p=friendica.git

Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Conflicts:
	mod/dfrn_poll.php
---

379af2521559c263622348bce41872b61067e532
diff --cc mod/dfrn_poll.php
index 4b25efe418,8dd4d31ede..77beabf904
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@@ -445,9 -445,8 +445,9 @@@ function dfrn_poll_content(&$a) 
  					'sec' => $sec
  				));
  			}
- 
+ 			
  			$profile = $r[0]['nickname'];
 +
  			switch($destination_url) {
  				case 'profile':
  					$dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
@@@ -489,6 -488,7 +489,10 @@@
  						dbesc($session_id)
  					); 
  				}
++<<<<<<< HEAD
++=======
+ 				
++>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
  			
  				goaway($dest);
  			}