provide local_block - block_public as far as content but can connect with the grid.

diff --git a/include/items.php b/include/items.php
index 8039066af40002d525949f355106339476965d66..e71c10fae4c56d70ef69643236912b240089cd9d 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -2122,8 +2122,11 @@ function local_delivery($importer,$data) {
 
 
        $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
-       if(! $rawtags)
-               $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+
+// Fallback should not be needed here. If it isn't DFRN it won't have DFRN updated tags
+//     if(! $rawtags)
+//             $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+
        if($rawtags) {
                $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
                if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index cec2d7f8b01c1420f82a6b6b76090c897b305047..b3033c0aa22d0fe8586dd61f9f6496d824a4b9c6 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -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;
+                       }
                }