diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-11-12 12:04:46 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-11-12 12:04:46 +0100 |
| commit | ba91f9a23717cef0d9dc675e47f66e303f139708 (patch) | |
| tree | 3b9ed3cbd2e5848b7343383642bc81b507b141c3 /lib/public | |
| parent | c0538636440b7293dd074ff4867bd950d426cea3 (diff) | |
| download | nextcloud-server-ba91f9a23717cef0d9dc675e47f66e303f139708.tar.gz nextcloud-server-ba91f9a23717cef0d9dc675e47f66e303f139708.zip | |
add missing sql backticks, check sharing for error and add log
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 071304ec249..e8fd6b2e920 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -552,7 +552,7 @@ class Share { $itemTypes = $collectionTypes; } $placeholders = join(',', array_fill(0, count($itemTypes), '?')); - $where .= ' WHERE item_type IN ('.$placeholders.'))'; + $where .= ' WHERE `item_type` IN ('.$placeholders.'))'; $queryArgs = $itemTypes; } else { $where = ' WHERE `item_type` = ?'; @@ -629,7 +629,7 @@ class Share { $queryArgs[] = $item; if ($includeCollections && $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); } } @@ -677,6 +677,9 @@ class Share { $root = strlen($root); $query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit); $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(); $targets = array(); while ($row = $result->fetchRow()) { |