bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sites/all/modules/ckeditor/includes/ckeditor.features.inc
View File

@@ -2,7 +2,7 @@
/**
* CKEditor - The text editor for the Internet - http://ckeditor.com
* Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
* Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
*
* == BEGIN LICENSE ==
*
@@ -73,7 +73,7 @@ function ckeditor_profile_features_export_render($module_name, $data) {
$profiles = array();
$roles = user_roles();
foreach ($data as $name) {
$profile = (array) ckeditor_profile_load($name);
$profile = (array) ckeditor_profile_load($name, TRUE, FALSE);
$profiles[$name] = $profile;
}
@@ -101,18 +101,18 @@ function ckeditor_profile_features_revert($module) {
db_query("DELETE FROM {ckeditor_settings} WHERE name = :name", array(':name' => $name));
db_query("INSERT INTO {ckeditor_settings} (name, settings) VALUES(:name, :settings)", array(':name' => $name, ':settings' => serialize($profile['settings'])));
// Restore the profile roles
foreach ($profile["input_formats"] as $input_format => $input_format_name) {
if (isset($input_formats[$input_format])) {
if (empty($profile["input_formats"])) {
// Remove input format if none is specified
db_query("DELETE FROM {ckeditor_input_format} WHERE name = :name", array(':name' => $name));
}
else {
// Restore the profile roles
foreach ($profile["input_formats"] as $input_format => $input_format_name) {
if (!db_query("SELECT name FROM {ckeditor_input_format} WHERE format = :format AND name = :name", array(':name' => $name, ':format' => $input_format))->fetchField()) {
db_query("INSERT INTO {ckeditor_input_format} (name, format) VALUES(:name, :format)", array(':name' => $name, ':format' => $input_format));
}
}
else {
// Make sure they don't have access
db_query("DELETE FROM {ckeditor_input_format} WHERE format = :format AND name = :name", array(':name' => $name, ':format' => $input_format));
}
}
}
}
}
}