bug: diaspora_enabled setting turns it on but doesn't fully turn it off.

diff --git a/boot.php b/boot.php
index f08eda0f1ea5620343c78bb88dec36a62adea149..c0aa9ba82a9d9a83d8cde024616915bd8adad79e 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1301' );
+define ( 'FRIENDICA_VERSION',      '2.3.1302' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1134      );
 
@@ -90,6 +90,7 @@ define ( 'PAGE_SOAPBOX',           1 );
 define ( 'PAGE_COMMUNITY',         2 );
 define ( 'PAGE_FREELOVE',          3 );
 define ( 'PAGE_BLOG',              4 );
+define ( 'PAGE_PRVGROUP',          5 );
 
 /**
  * Network and protocol family types 

diff --git a/include/diaspora.php b/include/diaspora.php
index 04238f17ce9d3ae0862db36b58cf1fb079594575..9951cf42378967f01ade26ee2a16d6e466edb24e 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -9,6 +9,10 @@ require_once('include/queue_fn.php');
 
 function diaspora_dispatch_public($msg) {
 
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled)
+               return;
+
        $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ",
                dbesc(NETWORK_DIASPORA),
                dbesc($msg['author'])
@@ -29,6 +33,10 @@ function diaspora_dispatch($importer,$msg) {
 
        $ret = 0;
 
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled)
+               return;
+
        // php doesn't like dashes in variable names
 
        $msg['message'] = str_replace(