Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hubzilla
core
Commits
8caa4d9e
Commit
8caa4d9e
authored
Mar 19, 2017
by
Zot
Committed by
Mario
Mar 29, 2017
Browse files
attach_folder_rpaths() providing incorrect results
parent
d5525a38
Changes
1
Hide whitespace changes
Inline
Side-by-side
include/attach.php
View file @
8caa4d9e
...
...
@@ -2243,11 +2243,12 @@ function attach_folder_select_list($channel_id) {
if
(
$r
)
{
foreach
(
$r
as
$rv
)
{
$x
=
attach_folder_rpaths
(
$r
,
$rv
);
if
(
$x
)
if
(
$x
)
{
$out
[
$x
[
0
]]
=
$x
[
1
];
}
}
}
logger
(
'results: '
.
print_r
(
$out
,
true
));
return
$out
;
}
...
...
@@ -2266,7 +2267,6 @@ function attach_folder_rpaths($all_folders,$that_folder) {
continue
;
if
(
$selected
[
'hash'
]
==
$parent_hash
)
{
$path
=
'/'
.
$selected
[
'filename'
]
.
$path
;
$current_hash
=
$selected
[
'hash'
];
$parent_hash
=
$selected
[
'folder'
];
$found
=
true
;
break
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment