Skip to content

mahara
mahara
Commit 5f0fc03e authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files
Options

Merge "Bug 1563567: Calling get_view() when there is no view id" into 16.04_STABLE

parents b5b6a80f ceb6d333
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment