wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17597 from nextcloud/backport/17575/stable17

Browse source 
[stable17] Include the share in the Files_Sharing::loadAdditionalScripts event
This commit is contained in:
Roeland Jago Douma 2019-10-21 09:46:07 +02:00 committed by GitHub
commit a9775e36d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_sharing/lib/Controller/ShareController.php
View file

@ -445,7 +445,8 @@ class ShareController extends AuthPublicShareController {
\OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
\OCP\Util::addHeader('meta', ['property' => "og:image", 'content' => $ogPreview]);
$this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts');
$event = new GenericEvent(null, ['share' => $share]);
$this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts', $event);
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
$csp->addAllowedFrameDomain('\'self\'');

14
apps/files_sharing/tests/Controller/ShareControllerTest.php
View file

@ -254,7 +254,12 @@ class ShareControllerTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())
->method('dispatch')
->with('OCA\Files_Sharing::loadAdditionalScripts');
->with(
'OCA\Files_Sharing::loadAdditionalScripts',
$this->callback(function($event) use ($share) {
return $event->getArgument('share') === $share;
})
);
$this->l10n->expects($this->any())
->method('t')
@ -374,7 +379,12 @@ class ShareControllerTest extends \Test\TestCase {
$this->eventDispatcher->expects($this->once())
->method('dispatch')
->with('OCA\Files_Sharing::loadAdditionalScripts');
->with(
'OCA\Files_Sharing::loadAdditionalScripts',
$this->callback(function($event) use ($share) {
return $event->getArgument('share') === $share;
})
);
$this->l10n->expects($this->any())
->method('t')