Merge pull request #513 from unary/photo-comments

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 864fb375d9edc85dbec91399ce9bc9da09156237..b3033c0aa22d0fe8586dd61f9f6496d824a4b9c6 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -170,9 +170,9 @@ function dfrn_request_post(&$a) {
                                        info( t("Introduction complete.") . EOL);
                                }
 
-                               $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s limit 1",
+                               $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s' limit 1",
                                        intval(local_user()),
-                                       $dbesc($dfrn_url),
+                                       dbesc($dfrn_url),
                                        $parms['key'] // this was already escaped
                                );
                                if(count($r)) {
@@ -756,8 +756,10 @@ function dfrn_request_content(&$a) {
                 */
  
                if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-                       notice( t('Public access denied.') . EOL);
-                       return;
+                       if(! get_config('system','local_block')) {
+                               notice( t('Public access denied.') . EOL);
+                               return;
+                       }
                }