diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-22 06:50:47 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-22 06:50:47 +0100 |
| commit | 767b4f30f7ee114b1cfd66e68fa959ac033b5667 (patch) | |
| tree | 6df1045c07a3297d6e43550e37dda43d0ac925d2 /include | |
| parent | 8fbde780b37e3d5eeb2ee672a3474b3701eb9645 (diff) | |
| parent | ee11a74d0b7cff5061a4d498f8ecd15e55b91b07 (diff) | |
| download | volse-hubzilla-767b4f30f7ee114b1cfd66e68fa959ac033b5667.tar.gz volse-hubzilla-767b4f30f7ee114b1cfd66e68fa959ac033b5667.tar.bz2 volse-hubzilla-767b4f30f7ee114b1cfd66e68fa959ac033b5667.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/dba.php | 2 | ||||
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/security.php | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/dba.php b/include/dba.php index e2f369f19..49b325cf7 100644 --- a/include/dba.php +++ b/include/dba.php @@ -28,7 +28,7 @@ class dba { if($install) { if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { - notice( sprintf( t('Cannot locate DNS info for database server \'%s\'',$server))); + notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server)); $this->connected = false; $this->db = null; return; diff --git a/include/items.php b/include/items.php index 6900c5920..051659321 100644 --- a/include/items.php +++ b/include/items.php @@ -905,8 +905,6 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { require_once('simplepie/simplepie.inc'); - if(! $contact) - logger('consume feed: anonymous'); $feed = new SimplePie(); $feed->set_raw_data($xml); if($datedir) diff --git a/include/security.php b/include/security.php index 5e79e1edd..c74a9b4a3 100644 --- a/include/security.php +++ b/include/security.php @@ -25,7 +25,7 @@ function can_write_wall(&$a,$owner) { else { $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1", + AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1", intval($owner), intval(remote_user()), intval(REL_VIP), |