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

Merge pull request #7759 from nextcloud/7712_12 

[stable12] Use correct L10N files for jsconfig
This commit is contained in:
Roeland Jago Douma 2018-01-09 19:28:19 +01:00 committed by GitHub
parent e6f8869c2c e2c77e46ab
commit e1e06bf38f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Controller/OCJSController.php
View File

@ -31,11 +31,11 @@ use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\Defaults;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IRequest;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\L10N\IFactory;
class OCJSController extends Controller {
@ -47,7 +47,7 @@ class OCJSController extends Controller {
*
* @param string $appName
* @param IRequest $request
* @param IL10N $l
* @param IFactory $l10nFactory
* @param Defaults $defaults
* @param IAppManager $appManager
* @param ISession $session
@ -59,7 +59,7 @@ class OCJSController extends Controller {
*/
public function __construct($appName,
IRequest $request,
IL10N $l,
IFactory $l10nFactory,
Defaults $defaults,
IAppManager $appManager,
ISession $session,
@ -71,7 +71,7 @@ class OCJSController extends Controller {
parent::__construct($appName, $request);
$this->helper = new JSConfigHelper(
$l,
$l10nFactory->get('lib'),
$defaults,
$appManager,
$session,

2
lib/private/TemplateLayout.php
View File

@ -143,7 +143,7 @@ class TemplateLayout extends \OC_Template {
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
$jsConfigHelper = new JSConfigHelper(
\OC::$server->getL10N('core'),
\OC::$server->getL10N('lib'),
\OC::$server->query(Defaults::class),
\OC::$server->getAppManager(),
\OC::$server->getSession(),