diff options
| -rwxr-xr-x | boot.php | 3 | ||||
| -rwxr-xr-x | include/diaspora.php | 8 |
2 files changed, 10 insertions, 1 deletions
@@ -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 04238f17c..9951cf423 100755 --- 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( |