friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
friendica 2012-04-04 14:13:34 -07:00
parent 51658826f9
commit 62c60fd53d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -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

8
include/diaspora.php
View File

@ -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(