diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-08-02 19:53:04 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-08-02 19:53:04 +0200 |
| commit | 2af27434a4e4fdfa01cbd0714b63f9c360d4a9d1 (patch) | |
| tree | 5899f2c2f69fe7e08b8c09af8a2b378757284c32 /lib/db.php | |
| parent | d7916363e1efbc15a5dba51056fb8af93330e5eb (diff) | |
| parent | 43b31f2161775c7db62b46b8e4044f328f774aae (diff) | |
| download | nextcloud-server-2af27434a4e4fdfa01cbd0714b63f9c360d4a9d1.tar.gz nextcloud-server-2af27434a4e4fdfa01cbd0714b63f9c360d4a9d1.zip | |
merge master into doctrine-object
Diffstat (limited to 'lib/db.php')
| -rw-r--r-- | lib/db.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/db.php b/lib/db.php index 102782ac6ba..fec4eaaf93f 100644 --- a/lib/db.php +++ b/lib/db.php @@ -42,10 +42,7 @@ class DatabaseException extends Exception { */ class OC_DB { /** - * @var \Doctrine\DBAL\Connection - */ - /** - * @var \Doctrine\DBAL\Connection + * @var \OC\DB\Connection $connection */ static private $connection; //the prefered connection to use, only Doctrine @@ -164,6 +161,9 @@ class OC_DB { return true; } + /** + * @return \OC\DB\Connection + */ static public function getConnection() { self::connect(); return self::$connection; |