@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | function i18nviews_help($path, $arg) { |
| 17 | 17 | switch ($path) { |
| 18 | 18 | case 'admin/modules#description' : |
| 19 | - $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>'; |
|
| 20 | - $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>'; |
|
| 19 | + $output = '<p>'.t('Supports translation for views strings: title, header, footer...').'</p>'; |
|
| 20 | + $output .= '<p>'.t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))).'</p>'; |
|
| 21 | 21 | return $output; |
| 22 | 22 | } |
| 23 | 23 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | function i18nviews_views_api() { |
| 90 | 90 | return array( |
| 91 | 91 | 'api' => '2.0', |
| 92 | - 'path' => drupal_get_path('module', 'i18nviews') . '/includes', |
|
| 92 | + 'path' => drupal_get_path('module', 'i18nviews').'/includes', |
|
| 93 | 93 | ); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -110,10 +110,10 @@ discard block |
||
| 110 | 110 | // Also checking weird values for $display_id, see 277711 |
| 111 | 111 | if (!empty($view->display) && is_array($view->display) && is_string($display_id)) { |
| 112 | 112 | $fields = _i18nviews_display_fields(); |
| 113 | - if(!empty($view->display[$display_id])) { |
|
| 113 | + if (!empty($view->display[$display_id])) { |
|
| 114 | 114 | $fields = _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->handler->options, $fields); |
| 115 | 115 | } |
| 116 | - if($fields && !empty($view->display['default'])) { |
|
| 116 | + if ($fields && !empty($view->display['default'])) { |
|
| 117 | 117 | _i18nviews_localize_array($view->name, 'default', $view->display['default']->handler->options, $fields); |
| 118 | 118 | } |
| 119 | 119 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | foreach ($field_names as $field) { |
| 160 | 160 | if (!empty($data[$field])) { |
| 161 | 161 | if ($update) { |
| 162 | - $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL; |
|
| 162 | + $format = isset($data[$field.'_format']) ? $data[$field.'_format'] : NULL; |
|
| 163 | 163 | i18nstrings_update("views:$name:$group:$field", $data[$field], $format); |
| 164 | 164 | } |
| 165 | 165 | else { |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | if (isset($form_state['values'][$field])) { |
| 210 | 210 | $name = $form_state['view']->name; |
| 211 | 211 | $group = $form_state['display_id']; |
| 212 | - $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL; |
|
| 212 | + $format = isset($form_state['values'][$field.'_format']) ? $form_state['values'][$field.'_format'] : NULL; |
|
| 213 | 213 | i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format); |
| 214 | 214 | } |
| 215 | 215 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | function wysiwyg_profile_form($form_state, $profile) { |
| 12 | 12 | // Merge in defaults. |
| 13 | - $profile = (array) $profile; |
|
| 13 | + $profile = (array)$profile; |
|
| 14 | 14 | $profile += array( |
| 15 | 15 | 'format' => 0, |
| 16 | 16 | 'editor' => '', |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | 'css_path' => NULL, |
| 44 | 44 | 'css_classes' => NULL, |
| 45 | 45 | ); |
| 46 | - $profile = (object) $profile; |
|
| 46 | + $profile = (object)$profile; |
|
| 47 | 47 | |
| 48 | 48 | $formats = filter_formats(); |
| 49 | 49 | $editor = wysiwyg_get_editor($profile->editor); |
@@ -128,15 +128,15 @@ discard block |
||
| 128 | 128 | if (!empty($meta['path'])) { |
| 129 | 129 | // @todo Button icon locations are different in editors, editor versions, |
| 130 | 130 | // and contrib/custom plugins (like Image Assist, f.e.). |
| 131 | - $img_src = $meta['path'] . "/images/$name.gif"; |
|
| 131 | + $img_src = $meta['path']."/images/$name.gif"; |
|
| 132 | 132 | // Handle plugins that have more than one button. |
| 133 | 133 | if (!file_exists($img_src)) { |
| 134 | - $img_src = $meta['path'] . "/images/$button.gif"; |
|
| 134 | + $img_src = $meta['path']."/images/$button.gif"; |
|
| 135 | 135 | } |
| 136 | - $icon = file_exists($img_src) ? '<img src="' . base_path() . $img_src . '" title="' . $button . '" style="border: 1px solid grey; vertical-align: middle;" />' : ''; |
|
| 136 | + $icon = file_exists($img_src) ? '<img src="'.base_path().$img_src.'" title="'.$button.'" style="border: 1px solid grey; vertical-align: middle;" />' : ''; |
|
| 137 | 137 | } |
| 138 | 138 | $title = (isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title); |
| 139 | - $title = (!empty($icon) ? $icon . ' ' . $title : $title); |
|
| 139 | + $title = (!empty($icon) ? $icon.' '.$title : $title); |
|
| 140 | 140 | $form['buttons'][$name][$button] = array( |
| 141 | 141 | '#type' => 'checkbox', |
| 142 | 142 | '#title' => $title, |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | '#default_value' => $profile->settings['css_path'], |
| 280 | 280 | '#size' => 40, |
| 281 | 281 | '#maxlength' => 255, |
| 282 | - '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.') . '<br />' . t('Available tokens: <code>%b</code> (base path, eg: <code>/</code>), <code>%t</code> (path to theme, eg: <code>themes/garland</code>)') . '<br />' . t('Example:') . ' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css', |
|
| 282 | + '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.').'<br />'.t('Available tokens: <code>%b</code> (base path, eg: <code>/</code>), <code>%t</code> (path to theme, eg: <code>themes/garland</code>)').'<br />'.t('Example:').' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css', |
|
| 283 | 283 | ); |
| 284 | 284 | |
| 285 | 285 | $form['css']['css_classes'] = array( |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | 'description' => (isset($editor['error']) ? $editor['error'] : ''), |
| 405 | 405 | ); |
| 406 | 406 | if ($editor['installed']) { |
| 407 | - $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : ''); |
|
| 407 | + $options[$name] = $editor['title'].(isset($editor['installed version']) ? ' '.$editor['installed version'] : ''); |
|
| 408 | 408 | } |
| 409 | 409 | else { |
| 410 | 410 | // Build on-site installation instructions. |
@@ -412,10 +412,10 @@ discard block |
||
| 412 | 412 | $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries'])); |
| 413 | 413 | $targs = array( |
| 414 | 414 | '@editor-path' => $editor['editor path'], |
| 415 | - '@library-filepath' => $editor['library path'] . '/' . (isset($editor['libraries'][$library]['files'][0]) ? $editor['libraries'][$library]['files'][0] : key($editor['libraries'][$library]['files'])), |
|
| 415 | + '@library-filepath' => $editor['library path'].'/'.(isset($editor['libraries'][$library]['files'][0]) ? $editor['libraries'][$library]['files'][0] : key($editor['libraries'][$library]['files'])), |
|
| 416 | 416 | ); |
| 417 | - $instructions = '<p>' . t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs) . '</p>'; |
|
| 418 | - $instructions .= '<p>' . t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs) . '</p>'; |
|
| 417 | + $instructions = '<p>'.t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs).'</p>'; |
|
| 418 | + $instructions .= '<p>'.t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs).'</p>'; |
|
| 419 | 419 | |
| 420 | 420 | $status[$name]['description'] .= $instructions; |
| 421 | 421 | $count--; |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | '#value' => $options[$profiles[$id]->editor], |
| 466 | 466 | ); |
| 467 | 467 | if ($in_code_only) { |
| 468 | - $form['formats'][$id]['name']['#value'] .= ' <em>(' . t('From: !module module', array('!module' => $profiles[$id]->export_module)) . ')</em>'; |
|
| 468 | + $form['formats'][$id]['name']['#value'] .= ' <em>('.t('From: !module module', array('!module' => $profiles[$id]->export_module)).')</em>'; |
|
| 469 | 469 | } |
| 470 | 470 | } |
| 471 | 471 | else { |
@@ -477,13 +477,13 @@ discard block |
||
| 477 | 477 | $enable_save = TRUE; |
| 478 | 478 | } |
| 479 | 479 | if (isset($profiles[$id]) && !empty($profiles[$id]->editor)) { |
| 480 | - $edit = !empty($profiles[$id]->in_code_only)?t('Override'):t('Edit'); |
|
| 480 | + $edit = !empty($profiles[$id]->in_code_only) ? t('Override') : t('Edit'); |
|
| 481 | 481 | $form['formats'][$id]['edit'] = array( |
| 482 | 482 | '#value' => l($edit, "admin/settings/wysiwyg/profile/$id/edit"), |
| 483 | 483 | ); |
| 484 | 484 | // Only display delete/revert links for wysiwyg loaded from the database |
| 485 | 485 | if (!$in_code_only) { |
| 486 | - $delete = (empty($profiles[$id]->type) || $profiles[$id]->type == t('Normal'))?t('Delete'):t('Revert'); |
|
| 486 | + $delete = (empty($profiles[$id]->type) || $profiles[$id]->type == t('Normal')) ? t('Delete') : t('Revert'); |
|
| 487 | 487 | $form['formats'][$id]['delete'] = array( |
| 488 | 488 | '#value' => l($delete, "admin/settings/wysiwyg/profile/$id/delete"), |
| 489 | 489 | ); |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | * The installed editor version. |
| 47 | 47 | */ |
| 48 | 48 | function wysiwyg_jwysiwyg_version($editor) { |
| 49 | - $script = $editor['library path'] . '/jquery.wysiwyg.js'; |
|
| 49 | + $script = $editor['library path'].'/jquery.wysiwyg.js'; |
|
| 50 | 50 | if (!file_exists($script)) { |
| 51 | 51 | return; |
| 52 | 52 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * The installed editor version. |
| 51 | 51 | */ |
| 52 | 52 | function wysiwyg_fckeditor_version($editor) { |
| 53 | - $library = $editor['library path'] . '/fckeditor.js'; |
|
| 53 | + $library = $editor['library path'].'/fckeditor.js'; |
|
| 54 | 54 | if (!file_exists($library)) { |
| 55 | 55 | return; |
| 56 | 56 | } |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | function wysiwyg_fckeditor_settings($editor, $config, $theme) { |
| 100 | 100 | $settings = array( |
| 101 | - 'EditorPath' => base_path() . $editor['library path'] . '/', |
|
| 102 | - 'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/', |
|
| 103 | - 'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js', |
|
| 101 | + 'EditorPath' => base_path().$editor['library path'].'/', |
|
| 102 | + 'SkinPath' => base_path().$editor['library path'].'/editor/skins/'.$theme.'/', |
|
| 103 | + 'CustomConfigurationsPath' => base_path().drupal_get_path('module', 'wysiwyg').'/editors/js/fckeditor.config.js', |
|
| 104 | 104 | 'Width' => '100%', |
| 105 | 105 | 'Height' => 420, |
| 106 | 106 | 'LinkBrowser' => FALSE, |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | // Add path for native external plugins; internal ones do not need a path. |
| 181 | 181 | if (empty($plugin['internal']) && isset($plugin['path'])) { |
| 182 | 182 | // All native FCKeditor plugins use the filename fckplugin.js. |
| 183 | - $settings[$name]['path'] = base_path() . $plugin['path'] . '/'; |
|
| 183 | + $settings[$name]['path'] = base_path().$plugin['path'].'/'; |
|
| 184 | 184 | } |
| 185 | 185 | if (!empty($plugin['languages'])) { |
| 186 | 186 | $settings[$name]['languages'] = $plugin['languages']; |
@@ -199,10 +199,10 @@ discard block |
||
| 199 | 199 | // Populate required plugin settings. |
| 200 | 200 | $settings[$name] = $plugin['dialog settings'] + array( |
| 201 | 201 | 'title' => $plugin['title'], |
| 202 | - 'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'], |
|
| 202 | + 'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'], |
|
| 203 | 203 | 'iconTitle' => $plugin['icon title'], |
| 204 | 204 | // @todo These should only be set if the plugin defined them. |
| 205 | - 'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'], |
|
| 205 | + 'css' => base_path().$plugin['css path'].'/'.$plugin['css file'], |
|
| 206 | 206 | ); |
| 207 | 207 | } |
| 208 | 208 | return $settings; |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | 'internal' => TRUE, |
| 245 | 245 | ), |
| 246 | 246 | 'autogrow' => array( |
| 247 | - 'path' => $editor['library path'] . '/editor/plugins', |
|
| 247 | + 'path' => $editor['library path'].'/editor/plugins', |
|
| 248 | 248 | 'extensions' => array( |
| 249 | 249 | 'autogrow' => t('Autogrow'), |
| 250 | 250 | ), |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | 'load' => TRUE, |
| 256 | 256 | ), |
| 257 | 257 | 'bbcode' => array( |
| 258 | - 'path' => $editor['library path'] . '/editor/plugins', |
|
| 258 | + 'path' => $editor['library path'].'/editor/plugins', |
|
| 259 | 259 | 'extensions' => array( |
| 260 | 260 | 'bbcode' => t('BBCode'), |
| 261 | 261 | ), |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | 'load' => TRUE, |
| 264 | 264 | ), |
| 265 | 265 | 'dragresizetable' => array( |
| 266 | - 'path' => $editor['library path'] . '/editor/plugins', |
|
| 266 | + 'path' => $editor['library path'].'/editor/plugins', |
|
| 267 | 267 | 'extensions' => array( |
| 268 | 268 | 'dragresizetable' => t('Table drag/resize'), |
| 269 | 269 | ), |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | 'load' => TRUE, |
| 272 | 272 | ), |
| 273 | 273 | 'tablecommands' => array( |
| 274 | - 'path' => $editor['library path'] . '/editor/plugins', |
|
| 274 | + 'path' => $editor['library path'].'/editor/plugins', |
|
| 275 | 275 | 'buttons' => array( |
| 276 | 276 | 'TableCellProp' => t('Table: Cell properties'), |
| 277 | 277 | 'TableInsertRowAfter' => t('Table: Insert row after'), |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | 'title' => 'WYMeditor', |
| 14 | 14 | 'vendor url' => 'http://www.wymeditor.org/', |
| 15 | 15 | 'download url' => 'http://www.wymeditor.org/download/', |
| 16 | - 'library path' => wysiwyg_get_path('wymeditor') . '/wymeditor', |
|
| 16 | + 'library path' => wysiwyg_get_path('wymeditor').'/wymeditor', |
|
| 17 | 17 | 'libraries' => array( |
| 18 | 18 | 'min' => array( |
| 19 | 19 | 'title' => 'Minified', |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * The installed editor version. |
| 52 | 52 | */ |
| 53 | 53 | function wysiwyg_wymeditor_version($editor) { |
| 54 | - $script = $editor['library path'] . '/jquery.wymeditor.js'; |
|
| 54 | + $script = $editor['library path'].'/jquery.wymeditor.js'; |
|
| 55 | 55 | if (!file_exists($script)) { |
| 56 | 56 | return; |
| 57 | 57 | } |
@@ -99,10 +99,10 @@ discard block |
||
| 99 | 99 | // @todo Setup $library in wysiwyg_load_editor() already. |
| 100 | 100 | $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries'])); |
| 101 | 101 | $settings = array( |
| 102 | - 'basePath' => base_path() . $editor['library path'] . '/', |
|
| 102 | + 'basePath' => base_path().$editor['library path'].'/', |
|
| 103 | 103 | 'wymPath' => $editor['libraries'][$library]['files'][0], |
| 104 | 104 | // @todo Does not work in Drupal; jQuery can live anywhere. |
| 105 | - 'jQueryPath' => base_path() . 'misc/jquery.js', |
|
| 105 | + 'jQueryPath' => base_path().'misc/jquery.js', |
|
| 106 | 106 | 'updateSelector' => '.form-submit', |
| 107 | 107 | 'skin' => $theme, |
| 108 | 108 | ); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $settings['toolsItems'][] = array( |
| 137 | 137 | 'name' => $button, |
| 138 | 138 | 'title' => $plugins[$plugin][$type][$button], |
| 139 | - 'css' => 'wym_tools_' . $button, |
|
| 139 | + 'css' => 'wym_tools_'.$button, |
|
| 140 | 140 | ); |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $settings['containersItems'][] = array( |
| 164 | 164 | 'name' => strtoupper($tag), |
| 165 | 165 | 'title' => $containers[$tag], |
| 166 | - 'css' => 'wym_containers_' . $tag, |
|
| 166 | + 'css' => 'wym_containers_'.$tag, |
|
| 167 | 167 | ); |
| 168 | 168 | } |
| 169 | 169 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * The installed editor version. |
| 59 | 59 | */ |
| 60 | 60 | function wysiwyg_ckeditor_version($editor) { |
| 61 | - $library = $editor['library path'] . '/ckeditor.js'; |
|
| 61 | + $library = $editor['library path'].'/ckeditor.js'; |
|
| 62 | 62 | if (!file_exists($library)) { |
| 63 | 63 | return; |
| 64 | 64 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | fclose($library); |
| 73 | 73 | // Version numbers need to have three parts since 3.0.1. |
| 74 | 74 | $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]); |
| 75 | - return $version[1] . '.' . $version[2]; |
|
| 75 | + return $version[1].'.'.$version[2]; |
|
| 76 | 76 | } |
| 77 | 77 | $max_lines--; |
| 78 | 78 | } |
@@ -93,11 +93,11 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | function wysiwyg_ckeditor_themes($editor, $profile) { |
| 95 | 95 | // @todo Skins are not themes but this will do for now. |
| 96 | - $path = $editor['library path'] . '/skins/'; |
|
| 96 | + $path = $editor['library path'].'/skins/'; |
|
| 97 | 97 | if (file_exists($path) && ($dir_handle = opendir($path))) { |
| 98 | 98 | $themes = array(); |
| 99 | 99 | while ($file = readdir($dir_handle)) { |
| 100 | - if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') { |
|
| 100 | + if (is_dir($path.$file) && substr($file, 0, 1) != '.' && $file != 'CVS') { |
|
| 101 | 101 | $themes[] = $file; |
| 102 | 102 | } |
| 103 | 103 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | function wysiwyg_ckeditor_settings($editor, $config, $theme) { |
| 129 | 129 | $settings = array( |
| 130 | - 'baseHref' => $GLOBALS['base_url'] . '/', |
|
| 130 | + 'baseHref' => $GLOBALS['base_url'].'/', |
|
| 131 | 131 | 'width' => '100%', |
| 132 | 132 | // For better compatibility with smaller textareas. |
| 133 | 133 | 'resize_minWidth' => 450, |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | } |
| 186 | 186 | if (isset($config['resizing'])) { |
| 187 | 187 | // CKEditor tests "!== false", so ensure it is a Boolean. |
| 188 | - $settings['resize_enabled'] = (bool) $config['resizing']; |
|
| 188 | + $settings['resize_enabled'] = (bool)$config['resizing']; |
|
| 189 | 189 | } |
| 190 | 190 | if (isset($config['toolbar_loc'])) { |
| 191 | 191 | $settings['toolbarLocation'] = $config['toolbar_loc']; |
@@ -251,11 +251,11 @@ discard block |
||
| 251 | 251 | $settings[$name] = array(); |
| 252 | 252 | // Add path for native external plugins. |
| 253 | 253 | if (empty($plugin['internal']) && isset($plugin['path'])) { |
| 254 | - $settings[$name]['path'] = base_path() . $plugin['path'] . '/'; |
|
| 254 | + $settings[$name]['path'] = base_path().$plugin['path'].'/'; |
|
| 255 | 255 | } |
| 256 | 256 | // Force native internal plugins to use the standard path. |
| 257 | 257 | else { |
| 258 | - $settings[$name]['path'] = base_path() . $editor['library path'] . '/plugins/' . $name . '/'; |
|
| 258 | + $settings[$name]['path'] = base_path().$editor['library path'].'/plugins/'.$name.'/'; |
|
| 259 | 259 | } |
| 260 | 260 | // CKEditor defaults to 'plugin.js' on its own when filename is not set. |
| 261 | 261 | if (!empty($plugin['filename'])) { |
@@ -275,10 +275,10 @@ discard block |
||
| 275 | 275 | // Populate required plugin settings. |
| 276 | 276 | $settings[$name] = $plugin['dialog settings'] + array( |
| 277 | 277 | 'title' => $plugin['title'], |
| 278 | - 'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'], |
|
| 278 | + 'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'], |
|
| 279 | 279 | 'iconTitle' => $plugin['icon title'], |
| 280 | 280 | // @todo These should only be set if the plugin defined them. |
| 281 | - 'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'], |
|
| 281 | + 'css' => base_path().$plugin['css path'].'/'.$plugin['css file'], |
|
| 282 | 282 | ); |
| 283 | 283 | } |
| 284 | 284 | return $settings; |
@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | function wysiwyg_markitup_version($editor) { |
| 50 | 50 | // Changelog was in markitup/markitup/readme.txt <= 1.1.5. |
| 51 | - $changelog = $editor['library path'] . '/markitup/readme.txt'; |
|
| 51 | + $changelog = $editor['library path'].'/markitup/readme.txt'; |
|
| 52 | 52 | if (!file_exists($changelog)) { |
| 53 | 53 | // Changelog was moved up to markitup/CHANGELOG.md after 1.1.5. |
| 54 | - $changelog = $editor['library path'] . '/CHANGELOG.md'; |
|
| 54 | + $changelog = $editor['library path'].'/CHANGELOG.md'; |
|
| 55 | 55 | if (!file_exists($changelog)) { |
| 56 | 56 | return; |
| 57 | 57 | } |
@@ -98,10 +98,10 @@ discard block |
||
| 98 | 98 | function wysiwyg_markitup_settings($editor, $config, $theme) { |
| 99 | 99 | // Whoever is guilty for adding this horrible CSS-file-without-filepath |
| 100 | 100 | // override "feature" to Drupal core... stand in the corner! |
| 101 | - drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', 'theme'); |
|
| 101 | + drupal_add_css($editor['library path'].'/markitup/skins/'.$theme.'/style.css', 'theme'); |
|
| 102 | 102 | |
| 103 | 103 | $settings = array( |
| 104 | - 'root' => base_path() . $editor['library path'] . '/markitup/', |
|
| 104 | + 'root' => base_path().$editor['library path'].'/markitup/', |
|
| 105 | 105 | 'nameSpace' => $theme, |
| 106 | 106 | 'markupSet' => array(), |
| 107 | 107 | ); |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | 'title' => 'YUI editor', |
| 14 | 14 | 'vendor url' => 'http://developer.yahoo.com/yui/editor/', |
| 15 | 15 | 'download url' => 'http://developer.yahoo.com/yui/download/', |
| 16 | - 'library path' => wysiwyg_get_path('yui') . '/build', |
|
| 16 | + 'library path' => wysiwyg_get_path('yui').'/build', |
|
| 17 | 17 | 'libraries' => array( |
| 18 | 18 | 'min' => array( |
| 19 | 19 | 'title' => 'Minified', |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * The installed editor version. |
| 65 | 65 | */ |
| 66 | 66 | function wysiwyg_yui_version($editor) { |
| 67 | - $library = $editor['library path'] . '/editor/editor.js'; |
|
| 67 | + $library = $editor['library path'].'/editor/editor.js'; |
|
| 68 | 68 | if (!file_exists($library)) { |
| 69 | 69 | return; |
| 70 | 70 | } |
@@ -105,11 +105,11 @@ discard block |
||
| 105 | 105 | * The internal library name (array key) to use. |
| 106 | 106 | */ |
| 107 | 107 | function wysiwyg_yui_load($editor, $library) { |
| 108 | - drupal_add_css($editor['library path'] . '/menu/assets/skins/sam/menu.css'); |
|
| 109 | - drupal_add_css($editor['library path'] . '/button/assets/skins/sam/button.css'); |
|
| 110 | - drupal_add_css($editor['library path'] . '/fonts/fonts-min.css'); |
|
| 111 | - drupal_add_css($editor['library path'] . '/container/assets/skins/sam/container.css'); |
|
| 112 | - drupal_add_css($editor['library path'] . '/editor/assets/skins/sam/editor.css'); |
|
| 108 | + drupal_add_css($editor['library path'].'/menu/assets/skins/sam/menu.css'); |
|
| 109 | + drupal_add_css($editor['library path'].'/button/assets/skins/sam/button.css'); |
|
| 110 | + drupal_add_css($editor['library path'].'/fonts/fonts-min.css'); |
|
| 111 | + drupal_add_css($editor['library path'].'/container/assets/skins/sam/container.css'); |
|
| 112 | + drupal_add_css($editor['library path'].'/editor/assets/skins/sam/editor.css'); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | // YUI only supports inline CSS, so we need to use @import directives. |
| 210 | 210 | // Syntax: '@import "/base/path/to/theme/style.css"; ' |
| 211 | 211 | if (!empty($settings['extracss'])) { |
| 212 | - $settings['extracss'] = '@import "' . implode('"; @import "', $settings['extracss']) . '";'; |
|
| 212 | + $settings['extracss'] = '@import "'.implode('"; @import "', $settings['extracss']).'";'; |
|
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | 'title' => 'openWYSIWYG', |
| 14 | 14 | 'vendor url' => 'http://www.openwebware.com', |
| 15 | 15 | 'download url' => 'http://www.openwebware.com/download.shtml', |
| 16 | - 'library path' => wysiwyg_get_path('openwysiwyg') . '/scripts', |
|
| 16 | + 'library path' => wysiwyg_get_path('openwysiwyg').'/scripts', |
|
| 17 | 17 | 'libraries' => array( |
| 18 | 18 | 'src' => array( |
| 19 | 19 | 'title' => 'Source', |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | function wysiwyg_openwysiwyg_version($editor) { |
| 47 | 47 | // 'library path' has '/scripts' appended already. |
| 48 | - $changelog = $editor['editor path'] . '/changelog'; |
|
| 48 | + $changelog = $editor['editor path'].'/changelog'; |
|
| 49 | 49 | if (!file_exists($changelog)) { |
| 50 | 50 | return; |
| 51 | 51 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | function wysiwyg_openwysiwyg_settings($editor, $config, $theme) { |
| 92 | 92 | $settings = array( |
| 93 | - 'path' => base_path() . $editor['editor path'] . '/', |
|
| 93 | + 'path' => base_path().$editor['editor path'].'/', |
|
| 94 | 94 | 'Width' => '100%', |
| 95 | 95 | ); |
| 96 | 96 | |