diff options
| author | friendica <info@friendica.com> | 2012-02-01 19:23:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-01 19:23:45 -0800 |
| commit | 94e396e6c4fda7a9113bfdb122fadfde0421e81c (patch) | |
| tree | 2eb48e4a901751d0fc7e8bdf3f26564f34db6a3d /include/poller.php | |
| parent | 64d0616762efcff413a335f2fdde4d8219d44895 (diff) | |
| parent | 840f69e2c8ba014b89314191859ad0b8b35631d5 (diff) | |
| download | volse-hubzilla-94e396e6c4fda7a9113bfdb122fadfde0421e81c.tar.gz volse-hubzilla-94e396e6c4fda7a9113bfdb122fadfde0421e81c.tar.bz2 volse-hubzilla-94e396e6c4fda7a9113bfdb122fadfde0421e81c.zip | |
Merge branch 'master' into spam
Diffstat (limited to 'include/poller.php')
| -rwxr-xr-x | include/poller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/poller.php b/include/poller.php index 89e4488b9..7d42c63b5 100755 --- a/include/poller.php +++ b/include/poller.php @@ -369,7 +369,7 @@ function poller_run($argv, $argc){ $xml = fetch_url($contact['poll']); } - elseif($contact['network'] === NETWORK_MAIL) { + elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) { $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); if($mail_disabled) @@ -462,7 +462,7 @@ function poller_run($argv, $argc){ $datarray['contact-id'] = $contact['id']; if($datarray['parent-uri'] === $datarray['uri']) $datarray['private'] = 1; - if(! get_pconfig($importer_uid,'system','allow_public_email_replies')) { + if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { $datarray['private'] = 1; $datarray['allow_cid'] = '<' . $contact['id'] . '>'; } |