Skip to content
GitLab
Menu
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
37439d2d
Commit
37439d2d
authored
Jun 27, 2016
by
Robert Lyon
Committed by
Gerrit Code Review
Jun 27, 2016
Browse files
Merge "Bug 1576643 - Enabled tinyMCE on mobile devices"
parents
ea8aec10
4616ac02
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/mahara.php
View file @
37439d2d
...
...
@@ -4023,7 +4023,7 @@ function is_html_editor_enabled () {
return
(
(
!
get_config
(
'wysiwyg'
)
&&
$USER
->
get_account_preference
(
'wysiwyg'
))
||
(
get_config
(
'wysiwyg'
)
==
'enable'
&&
$USER
->
is_logged_in
())
)
&&
$SESSION
->
get
(
'handheld_device'
)
==
false
;
);
}
/**
...
...
htdocs/lib/web.php
View file @
37439d2d
...
...
@@ -212,7 +212,7 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
// Note: we do not display tinyMCE for mobile devices
// as it doesn't work on some of them and can
// disable the editing of a textarea field
if
(
$SESSION
->
get
(
'handheld_device'
)
==
false
)
{
if
(
is_html_editor_enabled
()
)
{
$checkarray
=
array
(
&
$javascript
,
&
$headers
);
$found_tinymce
=
false
;
foreach
(
$checkarray
as
&
$check
)
{
...
...
Write
Preview
Supports
Markdown
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