diff options
author | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
---|---|---|
committer | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
commit | 2bfad189e7e9c8ea78e4b5f78c9e779074dd991c (patch) | |
tree | 697204517c95647e382a4723545ade3950420913 /lib/log.php | |
parent | e69079f9354464d21f31ae8b6d9e47988ba22fb4 (diff) | |
parent | d12d08e2f3553b06df6371535f971c9f193bd388 (diff) | |
download | nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.tar.gz nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.zip |
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
lib/base.php
lib/filestorage.php
Diffstat (limited to 'lib/log.php')
-rw-r--r-- | lib/log.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/log.php b/lib/log.php index 894575ef059..764c094c919 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)) { @@ -79,7 +79,7 @@ class OC_LOG { * - app: only entries for this app */ public static function get( $filter = array()){ - $queryString='SELECT * FROM *PREFIX*log WHERE 1=1 ORDER BY moment DESC'; + $queryString='SELECT * FROM `*PREFIX*log` WHERE 1=1 ORDER BY moment DESC'; $params=array(); if(isset($filter['from'])){ $queryString.='AND moment>? '; @@ -116,7 +116,7 @@ class OC_LOG { * This function deletes all entries that are older than $date. */ public static function deleteBefore( $date ){ - $query=OC_DB::prepare("DELETE FROM *PREFIX*log WHERE moment<?"); + $query=OC_DB::prepare("DELETE FROM `*PREFIX*log` WHERE moment<?"); $query->execute(array($date)); return true; } @@ -128,7 +128,7 @@ class OC_LOG { * This function deletes all log entries. */ public static function deleteAll(){ - $query=OC_DB::prepare("DELETE FROM *PREFIX*log"); + $query=OC_DB::prepare("DELETE FROM `*PREFIX*log`"); $query->execute(); return true; } |