From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sat, 14 Aug 2010 15:45:44 +0000 (-0400)
Subject: use injector for Vfs
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bf673c895b33404bb310e6bb22a6b98ba9ea4673;p=horde.git

use injector for Vfs
---

diff --git a/whups/lib/Driver/sql.php b/whups/lib/Driver/sql.php
index b97799c92..d40ef424f 100644
--- a/whups/lib/Driver/sql.php
+++ b/whups/lib/Driver/sql.php
@@ -1218,13 +1218,8 @@ class Whups_Driver_sql extends Whups_Driver {
                 Horde::logMessage($attachments, 'ERR');
                 return $attachments;
             }
-            require_once 'VFS.php';
-            $vfs = &VFS::singleton($GLOBALS['conf']['vfs']['type'],
-                                   Horde::getDriverConfig('vfs'));
-            if (is_a($vfs, 'PEAR_Error')) {
-                return $vfs;
-            }
 
+            $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs();
             while ($attachment = $attachments->fetchRow(DB_FETCHMODE_ASSOC)) {
                 $dir = WHUPS_VFS_ATTACH_PATH . '/' . $attachment['ticket_id'];
                 if ($vfs->exists($dir, $attachment['log_value'])) {