diff options
| author | Serge Martin <edb@sigluy.net> | 2011-08-07 19:02:41 +0200 |
|---|---|---|
| committer | Serge Martin <edb@sigluy.net> | 2011-08-07 19:02:41 +0200 |
| commit | acf7916e71f1e290aa12eb259d92aa8ab2ffcf23 (patch) | |
| tree | 9ab94628669f789c8214c8da197cd2d6d030291b /lib | |
| parent | a0b7b85c5678d09504fa2d39e64a86b26ee25410 (diff) | |
| download | nextcloud-server-acf7916e71f1e290aa12eb259d92aa8ab2ffcf23.tar.gz nextcloud-server-acf7916e71f1e290aa12eb259d92aa8ab2ffcf23.zip | |
user is a reserved word in postgresql
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/log.php | 4 | ||||
| -rw-r--r-- | lib/ocs.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/log.php b/lib/log.php index d51b2ef0785..1ed8e0e33c2 100644 --- a/lib/log.php +++ b/lib/log.php @@ -51,7 +51,7 @@ class OC_Log { * This function adds another entry to the log database */ public static function add( $appid, $subject, $predicate, $object = ' ' ){ - $query=OC_DB::prepare("INSERT INTO `*PREFIX*log`(moment,appid,user,action,info) VALUES(NOW(),?,?,?,?)"); + $query=OC_DB::prepare("INSERT INTO `*PREFIX*log`(moment,appid,`user`,action,info) VALUES(NOW(),?,?,?,?)"); $result=$query->execute(array($appid,$subject,$predicate,$object)); // Die if we have an error if( PEAR::isError($result)) { @@ -90,7 +90,7 @@ class OC_Log { array_push($params,$filter('until')); } if(isset($filter['user'])){ - $queryString.='AND user=? '; + $queryString.='AND `user`=? '; array_push($params,$filter('user')); } if(isset($filter['app'])){ 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); |