From: Robin Appelman <icewind1991@gmail.com>
Date: Mon, 5 Jul 2010 11:35:41 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.0~351^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db5ac0b477b4e6e4a47a0bd0cc6321b3dd95957b;p=nextcloud-server.git

merge
---

db5ac0b477b4e6e4a47a0bd0cc6321b3dd95957b
diff --cc inc/lib_base.php
index d946f565c8a,f991e40dfd8..67dbcb2eac9
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@@ -301,7 -300,8 +301,9 @@@ class OC_UTIL 
   */
  class OC_DB {
  	static private $DBConnection=false;
 +	static private $schema=false;
+ 	static private $affected=0;
+ 	static private $result=false;
  	/**
  	* connect to the datbase if not already connected
  	*/
@@@ -368,10 -357,8 +370,10 @@@
  		OC_DB::connect();
  		if($CONFIG_DBTYPE=='sqlite'){//fix differences between sql versions
  			$cmd=str_replace('`','',$cmd);
 +		}elseif($CONFIG_DBTYPE=='pgsql'){
 +			$cmd=str_replace('`','"',$cmd);
  		}
- 		$result=self::$DBConnection->query($cmd);
+ 		$result=self::$DBConnection->exec($cmd);
  		if (PEAR::isError($result)) {
  			$entry='DB Error: "'.$result->getMessage().'"<br />';
  			$entry.='Offending command was: '.$cmd.'<br />';