diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-14 22:57:03 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-14 22:57:03 +0200 |
| commit | b6eded11193e84bafc8918eac3566e114ee17f01 (patch) | |
| tree | d6b4ef16b1c6d4732be6497c1f2061377119fd5a /include/attach.php | |
| parent | c8d8ae89d769f8b650c44e1387a0c33a759be87b (diff) | |
| parent | b2d949ce9a499653bba833913084b0c1406cca7f (diff) | |
| download | volse-hubzilla-b6eded11193e84bafc8918eac3566e114ee17f01.tar.gz volse-hubzilla-b6eded11193e84bafc8918eac3566e114ee17f01.tar.bz2 volse-hubzilla-b6eded11193e84bafc8918eac3566e114ee17f01.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index 0ed1690ec..fc95e3a75 100644 --- a/include/attach.php +++ b/include/attach.php @@ -595,7 +595,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { } } else { - $folder_hash = ((array_key_exists('folder',$args)) ? $args['folder'] : ''); + $folder_hash = ((($arr) && array_key_exists('folder',$arr)) ? $arr['folder'] : ''); } if((! $options) || ($options === 'import')) { |