Merge branch 'pull'

2012-03-13 15:41:13 -07:00
parent dc84da520d acc4bbeb6e
commit 427362c324
23 changed files with 162 additions and 58 deletions
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -43,7 +43,7 @@ function dfrn_request_post(&$a) {
 		return;


-	if($_POST['cancel']) {
+	if(x($_POST, 'cancel')) {
 		goaway(z_root());
 	}