manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New 'libraries' folder in root instalation directory

Browse source
This commit is contained in:
Manuel Cillero 2017-08-08 18:24:12 +02:00
parent 05b6a91b0c
commit 006992b900
2267 changed files with 50 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/ckeditor/includes/ckeditor.admin.inc
View file

@ -45,7 +45,7 @@ function ckeditor_admin_main() {
'Checking for !filename or !file.',
array(
'!filename' => '<code>' . $ckconfig_file . '</code>',
'!file' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>'
'!file' => '<code>libraries/ckeditor/ckeditor.js</code>'
)
));
drupal_set_message(t(
@ -56,8 +56,8 @@ function ckeditor_admin_main() {
'!ckeditorpath' => '<code>' . $editor_path . '</code>',
'!ckeditorsubdir' => '<code>' . $editor_path . '/editor</code>',
'!ckeditorfile' => '<code>' . $editor_path . '/ckeditor.js</code>',
'!ckeditorlibrary' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>',
'!librarypath' => '<code>sites/all/libraries/ckeditor</code>'
'!ckeditorlibrary' => '<code>libraries/ckeditor/ckeditor.js</code>',
'!librarypath' => '<code>libraries/ckeditor</code>'
)
), 'error');
drupal_set_message(t(
@ -1614,7 +1614,7 @@ function ckeditor_admin_global_profile_form($form_state, $mode = 'add') {
'!path' => '<code>' . ckeditor_path(FALSE) . '</code>',
'!base' => '<code>' . base_path() . '</code>',
'!files' => '<code>' . base_path() . $module_drupal_path . '</code>',
'!library' => '<code>' . base_path() . 'sites/all/libraries/</code>'
'!library' => '<code>' . base_path() . 'libraries/</code>'
)
),
'#required' => TRUE
@ -1656,7 +1656,7 @@ function ckeditor_admin_global_profile_form($form_state, $mode = 'add') {
'!l' => '<br /><code>%l</code>',
'!base' => '<code>' . base_path() . '</code>',
'!files' => '<code>' . base_path() . $module_drupal_path . '</code>' ,
'!library' => '<code>' . base_path() . 'sites/all/libraries/</code>'
'!library' => '<code>' . base_path() . 'libraries/</code>'
)
) .
'<br />' .
@ -1708,7 +1708,7 @@ function ckeditor_admin_global_profile_form($form_state, $mode = 'add') {
'!l' => '<br /><code>%l</code>',
'!base' => '<code>' . base_path() . '</code>',
'!files' => '<code>' . base_path() . $module_drupal_path . '</code>',
'!library' => '<code>' . base_path() . 'sites/all/libraries/</code>'
'!library' => '<code>' . base_path() . 'libraries/</code>'
)
) .
'<br />' .
@ -2322,4 +2322,4 @@ CKEDITOR.replace('editor', {
$html .= "</body>";
$html .= "</html>";
echo $html;
}
}

4
modules/ckeditor/includes/ckeditor.drush.inc
View file

@ -46,7 +46,7 @@ function ckeditor_drush_command() {
'callback' => 'ckeditor_drush_download',
'description' => dt('Downloads the required CKEditor library from svn.ckeditor.com.'),
'arguments' => array(
'path' => dt('Optional. The path to the download folder. If omitted, Drush will use the default location (<code>sites/all/libraries/ckeditor</code>).'),
'path' => dt('Optional. The path to the download folder. If omitted, Drush will use the default location (<code>libraries/ckeditor</code>).'),
),
);
return $items;
@ -61,7 +61,7 @@ function ckeditor_drush_download() {
$path = $args[0];
}
else {
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/sites/all/libraries/ckeditor';
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/libraries/ckeditor';
}
if (drush_shell_exec('svn checkout http://svn.ckeditor.com/CKEditor/releases/stable/ ' . $path)) {

4
modules/ckeditor/includes/ckeditor.lib.inc
View file

@ -614,8 +614,8 @@ function _ckeditor_script_path() {
elseif (file_exists($module_path . '/ckeditor/ckeditor/ckeditor.js')) {
$jspath='%m/ckeditor/ckeditor';
}
elseif (file_exists('sites/all/libraries/ckeditor/ckeditor.js')) {
$jspath='%b/sites/all/libraries/ckeditor';
elseif (file_exists('libraries/ckeditor/ckeditor.js')) {
$jspath='%b/libraries/ckeditor';
}
return $jspath;
}