diff options
| author | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
| commit | 196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch) | |
| tree | ba785f204e8616af5751d7303d3357c75b9d30bc /include/attach.php | |
| parent | 0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff) | |
| parent | ae8a30273a6b787985d06fa776d1726d4427f9be (diff) | |
| download | volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2 volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip | |
Merge branch 'master' into movejs
Conflicts:
version.inc
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/attach.php b/include/attach.php index 3eb7a9366..cd211f2a2 100644 --- a/include/attach.php +++ b/include/attach.php @@ -526,11 +526,14 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { $sql_options = ''; $basepath = 'store/' . $channel['channel_address']; + + logger('attach_mkdir: basepath: ' . $basepath); + if(! is_dir($basepath)) - @mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS,true); + mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS,true); - if(! perm_is_allowed($channel_id, get_observer_hash(),'write_storage')) { + if(! perm_is_allowed($channel_id, $observer_hash,'write_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } @@ -607,10 +610,10 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { dbesc(''), dbesc($created), dbesc($created), - dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : ''), - dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : ''), - dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : ''), - dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : '') + dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $channel['channel_allow_cid']), + dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $channel['channel_allow_gid']), + dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $channel['channel_deny_cid']), + dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : $channel['channel_deny_gid']) ); if($r) { |