Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
30ac28f9
Unverified
Commit
30ac28f9
authored
7 years ago
by
Roeland Jago Douma
Browse files
Options
Downloads
Patches
Plain Diff
Use correct L10N files for jsconfig
Signed-off-by:
Roeland Jago Douma
<
roeland@famdouma.nl
>
parent
0280cff6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/Controller/OCJSController.php
+4
-4
4 additions, 4 deletions
core/Controller/OCJSController.php
lib/private/TemplateLayout.php
+1
-1
1 addition, 1 deletion
lib/private/TemplateLayout.php
with
5 additions
and
5 deletions
core/Controller/OCJSController.php
+
4
−
4
View file @
30ac28f9
...
@@ -34,11 +34,11 @@ use OCP\AppFramework\Http\DataDisplayResponse;
...
@@ -34,11 +34,11 @@ use OCP\AppFramework\Http\DataDisplayResponse;
use
OCP\Defaults
;
use
OCP\Defaults
;
use
OCP\IConfig
;
use
OCP\IConfig
;
use
OCP\IGroupManager
;
use
OCP\IGroupManager
;
use
OCP\IL10N
;
use
OCP\IRequest
;
use
OCP\IRequest
;
use
OCP\ISession
;
use
OCP\ISession
;
use
OCP\IURLGenerator
;
use
OCP\IURLGenerator
;
use
OCP\IUserSession
;
use
OCP\IUserSession
;
use
OCP\L10N\IFactory
;
class
OCJSController
extends
Controller
{
class
OCJSController
extends
Controller
{
...
@@ -50,7 +50,7 @@ class OCJSController extends Controller {
...
@@ -50,7 +50,7 @@ class OCJSController extends Controller {
*
*
* @param string $appName
* @param string $appName
* @param IRequest $request
* @param IRequest $request
* @param I
L10N $l
* @param I
Factory $l10nFactory
* @param Defaults $defaults
* @param Defaults $defaults
* @param IAppManager $appManager
* @param IAppManager $appManager
* @param ISession $session
* @param ISession $session
...
@@ -62,7 +62,7 @@ class OCJSController extends Controller {
...
@@ -62,7 +62,7 @@ class OCJSController extends Controller {
*/
*/
public
function
__construct
(
$appName
,
public
function
__construct
(
$appName
,
IRequest
$request
,
IRequest
$request
,
I
L10N
$l
,
I
Factory
$l10nFactory
,
Defaults
$defaults
,
Defaults
$defaults
,
IAppManager
$appManager
,
IAppManager
$appManager
,
ISession
$session
,
ISession
$session
,
...
@@ -74,7 +74,7 @@ class OCJSController extends Controller {
...
@@ -74,7 +74,7 @@ class OCJSController extends Controller {
parent
::
__construct
(
$appName
,
$request
);
parent
::
__construct
(
$appName
,
$request
);
$this
->
helper
=
new
JSConfigHelper
(
$this
->
helper
=
new
JSConfigHelper
(
$l
,
$l
10nFactory
->
get
(
'lib'
)
,
$defaults
,
$defaults
,
$appManager
,
$appManager
,
$session
,
$session
,
...
...
This diff is collapsed.
Click to expand it.
lib/private/TemplateLayout.php
+
1
−
1
View file @
30ac28f9
...
@@ -146,7 +146,7 @@ class TemplateLayout extends \OC_Template {
...
@@ -146,7 +146,7 @@ class TemplateLayout extends \OC_Template {
if
(
$this
->
config
->
getSystemValue
(
'installed'
,
false
)
&&
$renderAs
!=
'error'
)
{
if
(
$this
->
config
->
getSystemValue
(
'installed'
,
false
)
&&
$renderAs
!=
'error'
)
{
if
(
\OC
::
$server
->
getContentSecurityPolicyNonceManager
()
->
browserSupportsCspV3
())
{
if
(
\OC
::
$server
->
getContentSecurityPolicyNonceManager
()
->
browserSupportsCspV3
())
{
$jsConfigHelper
=
new
JSConfigHelper
(
$jsConfigHelper
=
new
JSConfigHelper
(
\OC
::
$server
->
getL10N
(
'
core
'
),
\OC
::
$server
->
getL10N
(
'
lib
'
),
\OC
::
$server
->
query
(
Defaults
::
class
),
\OC
::
$server
->
query
(
Defaults
::
class
),
\OC
::
$server
->
getAppManager
(),
\OC
::
$server
->
getAppManager
(),
\OC
::
$server
->
getSession
(),
\OC
::
$server
->
getSession
(),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment