summaryrefslogtreecommitdiffstats
path: root/lib/ocs.php
diff options
context:
space:
mode:
authorSerge Martin <edb@sigluy.net>2011-08-07 19:02:41 +0200
committerSerge Martin <edb@sigluy.net>2011-08-07 19:02:41 +0200
commitacf7916e71f1e290aa12eb259d92aa8ab2ffcf23 (patch)
tree9ab94628669f789c8214c8da197cd2d6d030291b /lib/ocs.php
parenta0b7b85c5678d09504fa2d39e64a86b26ee25410 (diff)
downloadnextcloud-server-acf7916e71f1e290aa12eb259d92aa8ab2ffcf23.tar.gz
nextcloud-server-acf7916e71f1e290aa12eb259d92aa8ab2ffcf23.zip
user is a reserved word in postgresql
Diffstat (limited to 'lib/ocs.php')
-rw-r--r--lib/ocs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ocs.php b/lib/ocs.php
index 8c7556a173b..bcacfe704c0 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -407,7 +407,7 @@ class OC_OCS {
$entry=$result->fetchRow();
$totalcount=$entry['co'];
- $query=OC_DB::prepare('select id,timestamp,user,type,message from *PREFIX*log order by timestamp desc limit ?,?');
+ $query=OC_DB::prepare('select id,timestamp,`user`,type,message from *PREFIX*log order by timestamp desc limit ?,?');
$result = $query->execute(array(($page*$pagesize),$pagesize))->fetchAll();
$itemscount=count($result);