diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
| commit | e6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch) | |
| tree | aec719c0af896e1f47c0475f13ed2355dbf34f4f /lib/db.php | |
| parent | 8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff) | |
| parent | 17d466b03b91ccc058fe1a88340df36c22a580c2 (diff) | |
| download | nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/db.php')
| -rw-r--r-- | lib/db.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/db.php b/lib/db.php index 8472978d811..e48eece1e50 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; } @@ -815,8 +815,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); } /** |