Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
01488dfa
Commit
01488dfa
authored
Oct 26, 2011
by
Francois Marier
Committed by
Gerrit Code Review
Oct 26, 2011
Browse files
Merge "Fix clobbered pieform_element_*_views_js in block configuration forms"
parents
2761dedd
ff796d35
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/blocktype/lib.php
View file @
01488dfa
...
...
@@ -900,7 +900,7 @@ class BlockInstance {
$configjs
=
call_static_method
(
$blocktypeclass
,
'get_instance_config_javascript'
,
$this
);
if
(
is_array
(
$configjs
))
{
$js
=
$this
->
get_get_javascript_javascript
(
$configjs
);
$js
.
=
$this
->
get_get_javascript_javascript
(
$configjs
);
}
else
if
(
is_string
(
$configjs
))
{
$js
.
=
$configjs
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment