sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

user is a reserved word in postgresql

remotes/origin/stable
Serge Martin 2011-08-07 19:02:41 +07:00
parent a0b7b85c56
commit acf7916e71
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/log.php
Unescape Escape View File

@ -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'])){

2
lib/ocs.php
Unescape Escape View File

@ -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);