mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Inject the database connection

This commit is contained in:
Joas Schilling 2015-11-30 09:42:11 +01:00
parent e9094b8a41
commit 23046ca5b7
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/appinfo/app.php
View File

@ -65,6 +65,7 @@ $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadshe
new \OCA\Files\ActivityHelper(
\OC::$server->getTagManager()
),
\OC::$server->getDatabaseConnection(),
\OC::$server->getConfig()
);
});

10
apps/files/lib/activity.php
View File

@ -22,6 +22,7 @@
namespace OCA\Files;
use OCP\IDBConnection;
use OCP\L10N\IFactory;
use OCP\Activity\IExtension;
use OCP\Activity\IManager;
@ -52,6 +53,9 @@ class Activity implements IExtension {
/** @var \OCP\Activity\IManager */
protected $activityManager;
/** @var \OCP\IDBConnection */
protected $connection;
/** @var \OCP\IConfig */
protected $config;
@ -63,14 +67,16 @@ class Activity implements IExtension {
* @param IURLGenerator $URLGenerator
* @param IManager $activityManager
* @param ActivityHelper $helper
* @param IDBConnection $connection
* @param IConfig $config
*/
public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager, ActivityHelper $helper, IConfig $config) {
public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager, ActivityHelper $helper, IDBConnection $connection, IConfig $config) {
$this->languageFactory = $languageFactory;
$this->URLGenerator = $URLGenerator;
$this->l = $this->getL10N();
$this->activityManager = $activityManager;
$this->helper = $helper;
$this->connection = $connection;
$this->config = $config;
}
@ -391,7 +397,7 @@ class Activity implements IExtension {
}
foreach ($favorites['folders'] as $favorite) {
$fileQueryList[] = '`file` LIKE ?';
$parameters[] = \OC::$server->getDatabaseConnection()->escapeLikeParameter($favorite) . '/%';
$parameters[] = $this->connection->escapeLikeParameter($favorite) . '/%';
}
return [

7
apps/files/tests/activitytest.php
View File

@ -25,6 +25,12 @@ namespace OCA\Files\Tests;
use OCA\Files\Activity;
use Test\TestCase;
/**
* Class ActivityTest
*
* @group DB
* @package OCA\Files\Tests
*/
class ActivityTest extends TestCase {
/** @var \OC\ActivityManager */
@ -95,6 +101,7 @@ class ActivityTest extends TestCase {
$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
$this->activityManager,
$this->activityHelper,
\OC::$server->getDatabaseConnection(),
$this->config
);