Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ckeditor-3358962
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
Issue forks
ckeditor-3358962
Commits
0f873494
Commit
0f873494
authored
12 years ago
by
mkesicki
Browse files
Options
Downloads
Patches
Plain Diff
[
#1885938
] by michal_cksource: Disable div based editor on default
parent
93e97e26
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.txt
+2
-1
2 additions, 1 deletion
CHANGELOG.txt
includes/ckeditor.admin.inc
+1
-1
1 addition, 1 deletion
includes/ckeditor.admin.inc
includes/ckeditor.lib.inc
+2
-2
2 additions, 2 deletions
includes/ckeditor.lib.inc
with
5 additions
and
4 deletions
CHANGELOG.txt
+
2
−
1
View file @
0f873494
201
2-12-27
201
3-01-11
New stable release 7.x-1.x
Bug fixes:
[#1885938] by michal_cksource: Disable div based editor on default
[#1872064] by dczepierga: Undefined index: loadPlugins in ckeditor_modules_disabled() and ckeditor_modules_uninstalled()
2012-12-22
...
...
This diff is collapsed.
Click to expand it.
includes/ckeditor.admin.inc
+
1
−
1
View file @
0f873494
...
...
@@ -875,7 +875,7 @@ function ckeditor_admin_profile_form($form, $form_state, $profile = NULL) {
$form
[
'appearance'
][
'use_divarea'
]
=
array
(
'#type'
=>
'radios'
,
'#title'
=>
t
(
'"Div-based" editor'
),
'#default_value'
=>
!
empty
(
$profile
->
settings
[
'use_divarea'
])
?
$profile
->
settings
[
'use_divarea'
]
:
'
t
'
,
'#default_value'
=>
!
empty
(
$profile
->
settings
[
'use_divarea'
])
?
$profile
->
settings
[
'use_divarea'
]
:
'
f
'
,
'#options'
=>
array
(
't'
=>
t
(
'Enabled'
),
'f'
=>
t
(
'Disabled'
)
...
...
This diff is collapsed.
Click to expand it.
includes/ckeditor.lib.inc
+
2
−
2
View file @
0f873494
...
...
@@ -830,8 +830,8 @@ function ckeditor_profile_settings_compile($global_profile, $profile) {
}
//add support for divarea plugin from CKE4
if
((
(
isset
(
$conf
[
'use_divarea'
])
&&
$conf
[
'use_divarea'
]
==
't'
)
||
!
isset
(
$conf
[
'use_divarea'
]))
&&
file_exists
(
$editor_local_path
.
'/plugins/divarea/plugin.js'
))
{
$settings
[
'loadPlugins'
][
'divarea'
]
=
array
(
'name'
=>
'divarea'
,
'path'
=>
$editor_path
.
'/plugins/divarea/'
,
'buttons'
=>
FALSE
,
'default'
=>
'
t
'
);
if
(
isset
(
$conf
[
'use_divarea'
])
&&
$conf
[
'use_divarea'
]
==
't'
&&
file_exists
(
$editor_local_path
.
'/plugins/divarea/plugin.js'
))
{
$settings
[
'loadPlugins'
][
'divarea'
]
=
array
(
'name'
=>
'divarea'
,
'path'
=>
$editor_path
.
'/plugins/divarea/'
,
'buttons'
=>
FALSE
,
'default'
=>
'
f
'
);
}
if
(
isset
(
$conf
[
'html_entities'
])
&&
$conf
[
'html_entities'
]
==
'f'
)
{
...
...
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