[Pkg-owncloud-commits] [owncloud] 13/34: allow passing driver options, fixes #11718

[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 70e68280b86c933a946be636e722886bc2bfcc9a
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Mon Oct 27 12:30:29 2014 +0100

    allow passing driver options, fixes #11718
---
 lib/private/db.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/db.php b/lib/private/db.php
index 221a369..93d8973 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -89,6 +89,12 @@ class OC_DB {
 
 		$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_');
 
+		//additional driver options, eg. for mysql ssl
+		$driverOptions = OC_Config::getValue('dbdriveroptions', null);
+		if ($driverOptions) {
+			$connectionParams['driverOptions'] = $driverOptions;
+		}
+
 		try {
 			self::$connection = $factory->getConnection($type, $connectionParams);
 		} catch(\Doctrine\DBAL\DBALException $e) {

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