mirror of
https://github.com/owncloud/bookmarks.git
synced 2025-02-07 06:54:15 +01:00
Fix bookmark listing with mysql: limit is binded as string.
This commit is contained in:
parent
ce035ff9cf
commit
ab65f73ab3
@ -46,7 +46,6 @@ if($filterTag){
|
|||||||
}
|
}
|
||||||
|
|
||||||
$offset = isset($_GET['page']) ? intval($_GET['page']) * 10 : 0;
|
$offset = isset($_GET['page']) ? intval($_GET['page']) * 10 : 0;
|
||||||
$params[] = $offset;
|
|
||||||
|
|
||||||
$sort = isset($_GET['sort']) ? ($_GET['sort']) : 'bookmarks_sorting_recent';
|
$sort = isset($_GET['sort']) ? ($_GET['sort']) : 'bookmarks_sorting_recent';
|
||||||
if($sort == 'bookmarks_sorting_clicks') {
|
if($sort == 'bookmarks_sorting_clicks') {
|
||||||
@ -62,6 +61,7 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($CONFIG_DBTYPE == 'pgsql' ){
|
if($CONFIG_DBTYPE == 'pgsql' ){
|
||||||
|
$params[] = $offset;
|
||||||
$query = OC_DB::prepare('
|
$query = OC_DB::prepare('
|
||||||
SELECT id, url, title, array_to_string(array_agg(tag), \' \') as tags
|
SELECT id, url, title, array_to_string(array_agg(tag), \' \') as tags
|
||||||
FROM *PREFIX*bookmarks
|
FROM *PREFIX*bookmarks
|
||||||
@ -92,7 +92,7 @@ if($CONFIG_DBTYPE == 'pgsql' ){
|
|||||||
GROUP BY url
|
GROUP BY url
|
||||||
'.$sqlFilterTag.'
|
'.$sqlFilterTag.'
|
||||||
ORDER BY *PREFIX*bookmarks.'.$sqlSort.'
|
ORDER BY *PREFIX*bookmarks.'.$sqlSort.'
|
||||||
LIMIT ?, 10');
|
LIMIT '.$offset.', 10');
|
||||||
}
|
}
|
||||||
|
|
||||||
$bookmarks = $query->execute($params)->fetchAll();
|
$bookmarks = $query->execute($params)->fetchAll();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user