aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2010-07-05 13:31:32 +0200
committerRobin Appelman <icewind1991@gmail.com>2010-07-05 13:31:32 +0200
commit4e12ce63f974ee4ee3b67740fa931967a7fdca0f (patch)
treec16a79a11eeda6d1522eb7b913f3ff01fae38bca
parent3d2f68c43f4ed3b3bcf1f8a7d7fe17139a4604f1 (diff)
downloadnextcloud-server-4e12ce63f974ee4ee3b67740fa931967a7fdca0f.tar.gz
nextcloud-server-4e12ce63f974ee4ee3b67740fa931967a7fdca0f.zip
fix affected frows and free_result in OC_DB
-rwxr-xr-xinc/lib_base.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/inc/lib_base.php b/inc/lib_base.php
index aa14d3cec00..f991e40dfd8 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -300,6 +300,8 @@ class OC_UTIL {
*/
class OC_DB {
static private $DBConnection=false;
+ static private $affected=0;
+ static private $result=false;
/**
* connect to the datbase if not already connected
*/
@@ -356,12 +358,15 @@ class OC_DB {
if($CONFIG_DBTYPE=='sqlite'){//fix differences between sql versions
$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 />';
die($entry);
+ }else{
+ self::$affected=$result;
}
+ self::$result=$result;
return $result;
}
@@ -431,7 +436,7 @@ class OC_DB {
* @return int
*/
static function affected_rows() {
- self::$DBConnection->affectedRows();
+ return self::$affected;
}
/**
@@ -464,8 +469,11 @@ class OC_DB {
* @param unknown_type $result
* @return bool
*/
- static function free_result($result) {
- $result->free();
+ static function free_result() {
+ if(self::$result){
+ self::$result->free();
+ self::$result=false;
+ }
}
static public function disconnect(){