From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 6 Jul 2010 08:35:23 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~351^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1bdfe395cd5beabc4ec9e3bd55d944d933d7b053;p=nextcloud-server.git

Merge branch 'master' of gitorious.org:owncloud/owncloud

Conflicts:
	inc/lib_log.php
---

1bdfe395cd5beabc4ec9e3bd55d944d933d7b053
diff --cc inc/lib_log.php
index ce46e9a683d,1244a44a935..989308c82fc
--- a/inc/lib_log.php
+++ b/inc/lib_log.php
@@@ -48,9 -48,7 +48,8 @@@ class OC_LOG 
     * @param message $message
     */
    public static function event($user,$type,$message){
 -    $result = OC_DB::query('insert into log (timestamp,user,type,message) values ("'.time().'","'.addslashes($user).'","'.addslashes($type).'","'.addslashes($message).'")');
 +	global $CONFIG_DBTABLEPREFIX;
 +    $result = OC_DB::query('INSERT INTO `' . $CONFIG_DBTABLEPREFIX . 'log` (`timestamp`,`user`,`type`,`message`) VALUES ('.time().',\''.addslashes($user).'\','.addslashes($type).',\''.addslashes($message).'\');');
-     OC_DB::free_result($result);
    }