Patch by Matthew Groeninger to support applying child permissions
This commit is contained in:
@ -69,12 +69,10 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
|
||||
$limitsql = serendipity_db_limit_sql(serendipity_db_limit($start, $limit));
|
||||
}
|
||||
|
||||
if (!empty($directory)) {
|
||||
if ($strict_directory) {
|
||||
$cond['parts']['directory'] = " AND i.path = '" . serendipity_db_escape_string($directory) . "'\n";
|
||||
} else {
|
||||
$cond['parts']['directory'] = " AND i.path LIKE '" . serendipity_db_escape_string($directory) . "%'\n";
|
||||
}
|
||||
if ($strict_directory) {
|
||||
$cond['parts']['directory'] = " AND i.path = '" . serendipity_db_escape_string($directory) . "'\n";
|
||||
} elseif (!empty($directory)) {
|
||||
$cond['parts']['directory'] = " AND i.path LIKE '" . serendipity_db_escape_string($directory) . "%'\n";
|
||||
}
|
||||
|
||||
if (!empty($filename)) {
|
||||
|
Reference in New Issue
Block a user