diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-07 15:56:26 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-07 15:56:26 -0400 |
| commit | 1aa89b7cbb051875ffa577a6a89e9cf9bb6eafee (patch) | |
| tree | b4923b27fc550d37eeb609db02ef6d20a508ab30 /lib/log.php | |
| parent | 5d521d7c7c8f8e796a3ddc81e1e4430238ba5451 (diff) | |
| parent | 3e8ae8636cad91877c727c7b1ea77436816e7c3d (diff) | |
| download | nextcloud-server-1aa89b7cbb051875ffa577a6a89e9cf9bb6eafee.tar.gz nextcloud-server-1aa89b7cbb051875ffa577a6a89e9cf9bb6eafee.zip | |
Merge branch 'master' into sharing
Conflicts:
files/css/files.css
lib/base.php
Diffstat (limited to 'lib/log.php')
| -rw-r--r-- | lib/log.php | 4 |
1 files changed, 2 insertions, 2 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'])){ |