diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-23 14:04:35 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-23 14:04:35 +0100 |
| commit | 1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1 (patch) | |
| tree | 629a2c3cb457293bbe77c956011ad370aa087a78 /include | |
| parent | 4a1426934968384d10a38f335a1c0c49b058dc2d (diff) | |
| parent | 93504896155d74fc42f6bf60cb61d65295f6b911 (diff) | |
| download | volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.gz volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.tar.bz2 volse-hubzilla-1f1fe4d5be45599b92846e95ac1d8a1134ee3cd1.zip | |
Merge branch 'master' of github.com:fabrixxm/friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/dba.php | 2 | ||||
| -rw-r--r-- | include/security.php | 2 |
2 files changed, 2 insertions, 2 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/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), |