Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
5f0fc03e
Commit
5f0fc03e
authored
Apr 28, 2016
by
Aaron Wells
Committed by
Gerrit Code Review
Apr 28, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1563567: Calling get_view() when there is no view id" into 16.04_STABLE
parents
b5b6a80f
ceb6d333
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
htdocs/lib/imagebrowser.php
htdocs/lib/imagebrowser.php
+2
-2
No files found.
htdocs/lib/imagebrowser.php
View file @
5f0fc03e
...
...
@@ -226,9 +226,9 @@ class ImageBrowser {
'jssuccesscallback'
=>
'imageBrowserConfigSuccess'
,
'jserrorcallback'
=>
'imageBrowserConfigError'
,
'elements'
=>
$elements
,
'viewgroup'
=>
$this
->
get_view
()
->
get
(
'group'
),
'viewgroup'
=>
$this
->
get
(
'view'
)
?
$this
->
get_view
()
->
get
(
'group'
)
:
null
,
'group'
=>
$this
->
get
(
'group'
),
'viewinstitution'
=>
$this
->
get_view
()
->
get
(
'institution'
),
'viewinstitution'
=>
$this
->
get
(
'view'
)
?
$this
->
get_view
()
->
get
(
'institution'
)
:
null
,
'institution'
=>
$this
->
get
(
'institution'
),
'configdirs'
=>
$configdirs
,
'plugintype'
=>
'blocktype'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment