aboutsummaryrefslogtreecommitdiffstats
path: root/lib/db.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-11-04 19:58:48 +0100
committerArthur Schiwon <blizzz@owncloud.com>2012-11-04 19:58:48 +0100
commit00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch)
treef5d69cf10ef3fd157a21990a38515c03b74035a1 /lib/db.php
parentdf8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff)
parent8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff)
downloadnextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz
nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip
merge from master
Diffstat (limited to 'lib/db.php')
-rw-r--r--lib/db.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/db.php b/lib/db.php
index a43f2ad20b2..fba2687967f 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -115,7 +115,7 @@ class OC_DB {
$pass = OC_Config::getValue( "dbpassword", "" );
$type = OC_Config::getValue( "dbtype", "sqlite" );
if(strpos($host, ':')) {
- list($host, $port)=explode(':', $host,2);
+ list($host, $port)=explode(':', $host, 2);
}else{
$port=false;
}
@@ -324,7 +324,7 @@ class OC_DB {
if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.htmlentities($query).'<br />';
- OC_Log::write('core', $entry,OC_Log::FATAL);
+ OC_Log::write('core', $entry, OC_Log::FATAL);
error_log('DB error: '.$entry);
die( $entry );
}
@@ -334,7 +334,7 @@ class OC_DB {
}catch(PDOException $e) {
$entry = 'DB Error: "'.$e->getMessage().'"<br />';
$entry .= 'Offending command was: '.htmlentities($query).'<br />';
- OC_Log::write('core', $entry,OC_Log::FATAL);
+ OC_Log::write('core', $entry, OC_Log::FATAL);
error_log('DB error: '.$entry);
die( $entry );
}
@@ -767,8 +767,8 @@ class PDOStatementWrapper{
/**
* pass all other function directly to the PDOStatement
*/
- public function __call($name,$arguments) {
- return call_user_func_array(array($this->statement,$name), $arguments);
+ public function __call($name, $arguments) {
+ return call_user_func_array(array($this->statement, $name), $arguments);
}
/**