Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
80fdd085
Commit
80fdd085
authored
Jun 10, 2013
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2008976
by InternetDevels: Replace theme() with drupal_render() in ckeditor module.
parent
972bed0f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
core/modules/ckeditor/ckeditor.admin.inc
core/modules/ckeditor/ckeditor.admin.inc
+6
-1
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
...s/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+6
-2
No files found.
core/modules/ckeditor/ckeditor.admin.inc
View file @
80fdd085
...
...
@@ -58,7 +58,12 @@ function theme_ckeditor_settings_toolbar($variables) {
$value
=
$button
[
'image_alternative'
.
$rtl
];
}
elseif
(
isset
(
$button
[
'image'
]))
{
$value
=
theme
(
'image'
,
array
(
'uri'
=>
$button
[
'image'
.
$rtl
],
'title'
=>
$button
[
'label'
]));
$image
=
array
(
'#theme'
=>
'image'
,
'#uri'
=>
$button
[
'image'
.
$rtl
],
'#title'
=>
$button
[
'label'
],
);
$value
=
drupal_render
(
$image
);
}
else
{
$value
=
'?'
;
...
...
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
View file @
80fdd085
...
...
@@ -51,7 +51,11 @@ public function getDefaultSettings() {
public
function
settingsForm
(
array
$form
,
array
&
$form_state
,
EditorEntity
$editor
)
{
$module_path
=
drupal_get_path
(
'module'
,
'ckeditor'
);
$manager
=
drupal_container
()
->
get
(
'plugin.manager.ckeditor.plugin'
);
$ckeditor_settings_toolbar
=
array
(
'#theme'
=>
'ckeditor_settings_toolbar'
,
'#editor'
=>
$editor
,
'#plugins'
=>
$manager
->
getButtonsPlugins
(
$editor
),
);
$form
[
'toolbar'
]
=
array
(
'#type'
=>
'container'
,
'#attached'
=>
array
(
...
...
@@ -60,7 +64,7 @@ public function settingsForm(array $form, array &$form_state, EditorEntity $edit
array
(
'type'
=>
'setting'
,
'data'
=>
array
(
'ckeditor'
=>
array
(
'toolbarAdmin'
=>
theme
(
'
ckeditor_settings_toolbar
'
,
array
(
'editor'
=>
$editor
,
'plugins'
=>
$manager
->
getButtonsPlugins
(
$editor
))
),
'toolbarAdmin'
=>
drupal_render
(
$
ckeditor_settings_toolbar
),
)),
)
),
...
...
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