add missing sql backticks, check sharing for error and add log
This commit is contained in:
parent
c053863644
commit
ba91f9a237
|
@ -552,7 +552,7 @@ class Share {
|
||||||
$itemTypes = $collectionTypes;
|
$itemTypes = $collectionTypes;
|
||||||
}
|
}
|
||||||
$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
|
$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
|
||||||
$where .= ' WHERE item_type IN ('.$placeholders.'))';
|
$where .= ' WHERE `item_type` IN ('.$placeholders.'))';
|
||||||
$queryArgs = $itemTypes;
|
$queryArgs = $itemTypes;
|
||||||
} else {
|
} else {
|
||||||
$where = ' WHERE `item_type` = ?';
|
$where = ' WHERE `item_type` = ?';
|
||||||
|
@ -629,7 +629,7 @@ class Share {
|
||||||
$queryArgs[] = $item;
|
$queryArgs[] = $item;
|
||||||
if ($includeCollections && $collectionTypes) {
|
if ($includeCollections && $collectionTypes) {
|
||||||
$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
|
$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
|
||||||
$where .= ' OR item_type IN ('.$placeholders.'))';
|
$where .= ' OR `item_type` IN ('.$placeholders.'))';
|
||||||
$queryArgs = array_merge($queryArgs, $collectionTypes);
|
$queryArgs = array_merge($queryArgs, $collectionTypes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -677,6 +677,9 @@ class Share {
|
||||||
$root = strlen($root);
|
$root = strlen($root);
|
||||||
$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
|
$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
|
||||||
$result = $query->execute($queryArgs);
|
$result = $query->execute($queryArgs);
|
||||||
|
if (\OC_DB::isError($result)) {
|
||||||
|
\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where, \OC_Log::ERROR);
|
||||||
|
}
|
||||||
$items = array();
|
$items = array();
|
||||||
$targets = array();
|
$targets = array();
|
||||||
while ($row = $result->fetchRow()) {
|
while ($row = $result->fetchRow()) {
|
||||||
|
|
Loading…
Reference in New Issue