[Pkg-owncloud-commits] [owncloud] 62/223: Move getValue() to where required. This actually is not required "global data".

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 4ca1e3cc0295203f2d1bdca083b73ed56b8fa978
Author: Andreas Fischer <bantu at owncloud.com>
Date:   Thu Jun 12 19:59:40 2014 +0200

    Move getValue() to where required. This actually is not required "global data".
---
 lib/private/db.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/private/db.php b/lib/private/db.php
index df558df..a35a4f5 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -57,27 +57,23 @@ class OC_DB {
 			return true;
 		}
 
-		// The global data we need
-		$name = OC_Config::getValue( "dbname", "owncloud" );
-		$host = OC_Config::getValue( "dbhost", "" );
-		$user = OC_Config::getValue( "dbuser", "" );
-		$pass = OC_Config::getValue( "dbpassword", "" );
-		$type = OC_Config::getValue( "dbtype", "sqlite" );
-
+		$type = OC_Config::getValue('dbtype', 'sqlite');
 		$factory = new \OC\DB\ConnectionFactory();
 		if (!$factory->isValidType($type)) {
 			return false;
 		}
 
 		$connectionParams = array(
-			'user' => $user,
-			'password' => $pass,
+			'user' => OC_Config::getValue('dbuser', ''),
+			'password' => OC_Config::getValue('dbpassword', ''),
 		);
+		$name = OC_Config::getValue('dbname', 'owncloud');
 
 		if ($factory->normalizeType($type) === 'sqlite3') {
 			$datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data');
 			$connectionParams['path'] = $datadir.'/'.$name.'.db';
 		} else {
+			$host = OC_Config::getValue('dbhost', '');
 			if (strpos($host, ':')) {
 				// Host variable may carry a port or socket.
 				list($host, $socket) = explode(':', $host, 2);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git