Completed
Pull Request — master (#1795)
by Christian
09:22
created
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/fckeditor.inc 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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'),
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/wymeditor.inc 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/ckeditor.inc 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/markitup.inc 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
   );
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/yui.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/openwysiwyg.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/whizzywig.inc 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
  *   The installed editor version.
48 48
  */
49 49
 function wysiwyg_whizzywig_version($editor) {
50
-  $script = $editor['library path'] . '/whizzywig.js';
50
+  $script = $editor['library path'].'/whizzywig.js';
51 51
   if (!file_exists($script)) {
52 52
     return;
53 53
   }
@@ -80,15 +80,15 @@  discard block
 block discarded – undo
80 80
   $settings = array();
81 81
 
82 82
   // Add path to button images, if available.
83
-  if (is_dir($editor['library path'] . '/btn')) {
84
-    $settings['buttonPath'] = base_path() . $editor['library path'] . '/btn/';
83
+  if (is_dir($editor['library path'].'/btn')) {
84
+    $settings['buttonPath'] = base_path().$editor['library path'].'/btn/';
85 85
   }
86
-  if (file_exists($editor['library path'] . '/WhizzywigToolbar.png')) {
87
-    $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/WhizzywigToolbar.png';
86
+  if (file_exists($editor['library path'].'/WhizzywigToolbar.png')) {
87
+    $settings['toolbarImagePath'] = base_path().$editor['library path'].'/WhizzywigToolbar.png';
88 88
   }
89 89
   // Filename changed in version 60.
90
-  elseif (file_exists($editor['library path'] . '/icons.png')) {
91
-    $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/icons.png';
90
+  elseif (file_exists($editor['library path'].'/icons.png')) {
91
+    $settings['toolbarImagePath'] = base_path().$editor['library path'].'/icons.png';
92 92
   }
93 93
 
94 94
   // Add configured buttons or all available.
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
   // Add editor content stylesheet.
105 105
   if (isset($config['css_setting'])) {
106 106
     if ($config['css_setting'] == 'theme') {
107
-      $css = path_to_theme() . '/style.css';
107
+      $css = path_to_theme().'/style.css';
108 108
       if (file_exists($css)) {
109
-        $settings['externalCSS'] = base_path() . $css;
109
+        $settings['externalCSS'] = base_path().$css;
110 110
       }
111 111
     }
112 112
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/nicedit.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
  */
62 62
 function wysiwyg_nicedit_settings($editor, $config, $theme) {
63 63
   $settings = array(
64
-    'iconsPath' => base_path() . $editor['library path'] . '/nicEditorIcons.gif',
64
+    'iconsPath' => base_path().$editor['library path'].'/nicEditorIcons.gif',
65 65
   );
66 66
 
67 67
   // Add configured buttons or all available.
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
   // Add editor content stylesheet.
78 78
   if (isset($config['css_setting'])) {
79 79
     if ($config['css_setting'] == 'theme') {
80
-      $css = path_to_theme() . '/style.css';
80
+      $css = path_to_theme().'/style.css';
81 81
       if (file_exists($css)) {
82
-        $settings['externalCSS'] = base_path() . $css;
82
+        $settings['externalCSS'] = base_path().$css;
83 83
       }
84 84
     }
85 85
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/tinymce.inc 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
     'title' => 'TinyMCE',
16 16
     'vendor url' => 'http://tinymce.moxiecode.com',
17 17
     'download url' => 'http://tinymce.moxiecode.com/download.php',
18
-    'library path' => wysiwyg_get_path('tinymce') . '/jscripts/tiny_mce',
18
+    'library path' => wysiwyg_get_path('tinymce').'/jscripts/tiny_mce',
19 19
     'libraries' => array(
20 20
       '' => array(
21 21
         'title' => 'Minified',
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
  *   The installed editor version.
81 81
  */
82 82
 function wysiwyg_tinymce_version($editor) {
83
-  $script = $editor['library path'] . '/tiny_mce.js';
83
+  $script = $editor['library path'].'/tiny_mce.js';
84 84
   if (!file_exists($script)) {
85 85
     return;
86 86
   }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
   // 2.x: this.majorVersion="2";this.minorVersion="1.3"
92 92
   // 3.x: majorVersion:'3',minorVersion:'2.0.1'
93 93
   if (preg_match('@majorVersion[=:]["\'](\d).+?minorVersion[=:]["\']([\d\.]+)@', $line, $version)) {
94
-    return $version[1] . '.' . $version[2];
94
+    return $version[1].'.'.$version[2];
95 95
   }
96 96
 }
97 97
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
     $settings['remove_linebreaks'] = $config['remove_linebreaks'];
179 179
   }
180 180
   if (isset($config['verify_html'])) {
181
-    $settings['verify_html'] = (bool) $config['verify_html'];
181
+    $settings['verify_html'] = (bool)$config['verify_html'];
182 182
   }
183 183
 
184 184
   if (!empty($config['css_classes'])) {
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
           $plugin['filename'] = array_pop($parts);
325 325
           $plugin['path'] = implode('/', $parts);
326 326
         }
327
-        $settings[$name] = base_path() . $plugin['path'] . '/' . $plugin['filename'];
327
+        $settings[$name] = base_path().$plugin['path'].'/'.$plugin['filename'];
328 328
       }
329 329
     }
330 330
   }
@@ -340,11 +340,11 @@  discard block
 block discarded – undo
340 340
     // Populate required plugin settings.
341 341
     $settings[$name] = $plugin['dialog settings'] + array(
342 342
       'title' => $plugin['title'],
343
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
343
+      'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'],
344 344
       'iconTitle' => $plugin['icon title'],
345 345
     );
346 346
     if (isset($plugin['css file'])) {
347
-      $settings[$name]['css'] = base_path() . $plugin['css path'] . '/' . $plugin['css file'];
347
+      $settings[$name]['css'] = base_path().$plugin['css path'].'/'.$plugin['css file'];
348 348
     }
349 349
   }
350 350
   return $settings;
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 function _wysiwyg_tinymce_plugin_name($op, $name) {
365 365
   if ($op == 'add') {
366 366
     if (strpos($name, '-') !== 0) {
367
-      return '-' . $name;
367
+      return '-'.$name;
368 368
     }
369 369
     return $name;
370 370
   }
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 function wysiwyg_tinymce_plugins($editor) {
383 383
   $plugins = array(
384 384
     'default' => array(
385
-      'path' => $editor['library path'] . '/themes/advanced',
385
+      'path' => $editor['library path'].'/themes/advanced',
386 386
       'buttons' => array(
387 387
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
388 388
         'strikethrough' => t('Strike-through'),
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
       'internal' => TRUE,
407 407
     ),
408 408
     'advhr' => array(
409
-      'path' => $editor['library path'] . '/plugins/advhr',
409
+      'path' => $editor['library path'].'/plugins/advhr',
410 410
       'buttons' => array('advhr' => t('Advanced horizontal rule')),
411 411
       'extended_valid_elements' => array('hr[class|width|size|noshade]'),
412 412
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
       'load' => TRUE,
415 415
     ),
416 416
     'advimage' => array(
417
-      'path' => $editor['library path'] . '/plugins/advimage',
417
+      'path' => $editor['library path'].'/plugins/advimage',
418 418
       'extensions' => array('advimage' => t('Advanced image')),
419 419
       'extended_valid_elements' => array('img[src|alt|title|align|width|height|usemap|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
420 420
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
       'load' => TRUE,
423 423
     ),
424 424
     'advlink' => array(
425
-      'path' => $editor['library path'] . '/plugins/advlink',
425
+      'path' => $editor['library path'].'/plugins/advlink',
426 426
       'extensions' => array('advlink' => t('Advanced link')),
427 427
       'extended_valid_elements' => array('a[name|href|target|title|class|onfocus|onblur|onclick|ondlbclick|onmousedown|onmouseup|onmouseover|onmouseout|onkeypress|onkeydown|onkeyup|id|style|rel]'),
428 428
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
@@ -430,49 +430,49 @@  discard block
 block discarded – undo
430 430
       'load' => TRUE,
431 431
     ),
432 432
     'autosave' => array(
433
-      'path' => $editor['library path'] . '/plugins/autosave',
433
+      'path' => $editor['library path'].'/plugins/autosave',
434 434
       'extensions' => array('autosave' => t('Auto save')),
435 435
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
436 436
       'internal' => TRUE,
437 437
       'load' => TRUE,
438 438
     ),
439 439
     'contextmenu' => array(
440
-      'path' => $editor['library path'] . '/plugins/contextmenu',
440
+      'path' => $editor['library path'].'/plugins/contextmenu',
441 441
       'extensions' => array('contextmenu' => t('Context menu')),
442 442
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
443 443
       'internal' => TRUE,
444 444
       'load' => TRUE,
445 445
     ),
446 446
     'directionality' => array(
447
-      'path' => $editor['library path'] . '/plugins/directionality',
447
+      'path' => $editor['library path'].'/plugins/directionality',
448 448
       'buttons' => array('ltr' => t('Left-to-right'), 'rtl' => t('Right-to-left')),
449 449
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
450 450
       'internal' => TRUE,
451 451
       'load' => TRUE,
452 452
     ),
453 453
     'emotions' => array(
454
-      'path' => $editor['library path'] . '/plugins/emotions',
454
+      'path' => $editor['library path'].'/plugins/emotions',
455 455
       'buttons' => array('emotions' => t('Emotions')),
456 456
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
457 457
       'internal' => TRUE,
458 458
       'load' => TRUE,
459 459
     ),
460 460
     'font' => array(
461
-      'path' => $editor['library path'] . '/plugins/font',
461
+      'path' => $editor['library path'].'/plugins/font',
462 462
       'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')),
463 463
       'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'),
464 464
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font',
465 465
       'internal' => TRUE,
466 466
     ),
467 467
     'fullscreen' => array(
468
-      'path' => $editor['library path'] . '/plugins/fullscreen',
468
+      'path' => $editor['library path'].'/plugins/fullscreen',
469 469
       'buttons' => array('fullscreen' => t('Fullscreen')),
470 470
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
471 471
       'internal' => TRUE,
472 472
       'load' => TRUE,
473 473
     ),
474 474
     'inlinepopups' => array(
475
-      'path' => $editor['library path'] . '/plugins/inlinepopups',
475
+      'path' => $editor['library path'].'/plugins/inlinepopups',
476 476
       'extensions' => array('inlinepopups' => t('Inline popups')),
477 477
       'options' => array(
478 478
         'dialog_type' => array('modal'),
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
       'load' => TRUE,
483 483
     ),
484 484
     'insertdatetime' => array(
485
-      'path' => $editor['library path'] . '/plugins/insertdatetime',
485
+      'path' => $editor['library path'].'/plugins/insertdatetime',
486 486
       'buttons' => array('insertdate' => t('Insert date'), 'inserttime' => t('Insert time')),
487 487
       'options' => array(
488 488
         'plugin_insertdate_dateFormat' => '%Y-%m-%d',
@@ -493,49 +493,49 @@  discard block
 block discarded – undo
493 493
       'load' => TRUE,
494 494
     ),
495 495
     'layer' => array(
496
-      'path' => $editor['library path'] . '/plugins/layer',
496
+      'path' => $editor['library path'].'/plugins/layer',
497 497
       'buttons' => array('insertlayer' => t('Insert layer'), 'moveforward' => t('Move forward'), 'movebackward' => t('Move backward'), 'absolute' => t('Absolute')),
498 498
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
499 499
       'internal' => TRUE,
500 500
       'load' => TRUE,
501 501
     ),
502 502
     'paste' => array(
503
-      'path' => $editor['library path'] . '/plugins/paste',
503
+      'path' => $editor['library path'].'/plugins/paste',
504 504
       'buttons' => array('pastetext' => t('Paste text'), 'pasteword' => t('Paste from Word'), 'selectall' => t('Select all')),
505 505
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
506 506
       'internal' => TRUE,
507 507
       'load' => TRUE,
508 508
     ),
509 509
     'preview' => array(
510
-      'path' => $editor['library path'] . '/plugins/preview',
510
+      'path' => $editor['library path'].'/plugins/preview',
511 511
       'buttons' => array('preview' => t('Preview')),
512 512
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
513 513
       'internal' => TRUE,
514 514
       'load' => TRUE,
515 515
     ),
516 516
     'print' => array(
517
-      'path' => $editor['library path'] . '/plugins/print',
517
+      'path' => $editor['library path'].'/plugins/print',
518 518
       'buttons' => array('print' => t('Print')),
519 519
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
520 520
       'internal' => TRUE,
521 521
       'load' => TRUE,
522 522
     ),
523 523
     'searchreplace' => array(
524
-      'path' => $editor['library path'] . '/plugins/searchreplace',
524
+      'path' => $editor['library path'].'/plugins/searchreplace',
525 525
       'buttons' => array('search' => t('Search'), 'replace' => t('Replace')),
526 526
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
527 527
       'internal' => TRUE,
528 528
       'load' => TRUE,
529 529
     ),
530 530
     'style' => array(
531
-      'path' => $editor['library path'] . '/plugins/style',
531
+      'path' => $editor['library path'].'/plugins/style',
532 532
       'buttons' => array('styleprops' => t('Style properties')),
533 533
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
534 534
       'internal' => TRUE,
535 535
       'load' => TRUE,
536 536
     ),
537 537
     'table' => array(
538
-      'path' => $editor['library path'] . '/plugins/table',
538
+      'path' => $editor['library path'].'/plugins/table',
539 539
       'buttons' => array('tablecontrols' => t('Table')),
540 540
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
541 541
       'internal' => TRUE,
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
   );
545 545
   if (version_compare($editor['installed version'], '3', '<')) {
546 546
     $plugins['flash'] = array(
547
-      'path' => $editor['library path'] . '/plugins/flash',
547
+      'path' => $editor['library path'].'/plugins/flash',
548 548
       'buttons' => array('flash' => t('Flash')),
549 549
       'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]'),
550 550
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/flash',
@@ -554,14 +554,14 @@  discard block
 block discarded – undo
554 554
   }
555 555
   if (version_compare($editor['installed version'], '2.0.6', '>')) {
556 556
     $plugins['media'] = array(
557
-      'path' => $editor['library path'] . '/plugins/media',
557
+      'path' => $editor['library path'].'/plugins/media',
558 558
       'buttons' => array('media' => t('Media')),
559 559
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
560 560
       'internal' => TRUE,
561 561
       'load' => TRUE,
562 562
     );
563 563
     $plugins['xhtmlxtras'] = array(
564
-      'path' => $editor['library path'] . '/plugins/xhtmlxtras',
564
+      'path' => $editor['library path'].'/plugins/xhtmlxtras',
565 565
       'buttons' => array('cite' => t('Citation'), 'del' => t('Deleted'), 'abbr' => t('Abbreviation'), 'acronym' => t('Acronym'), 'ins' => t('Inserted'), 'attribs' => t('HTML attributes')),
566 566
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
567 567
       'internal' => TRUE,
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
   }
571 571
   if (version_compare($editor['installed version'], '3', '>')) {
572 572
     $plugins['bbcode'] = array(
573
-      'path' => $editor['library path'] . '/plugins/bbcode',
573
+      'path' => $editor['library path'].'/plugins/bbcode',
574 574
       'extensions' => array('bbcode' => t('BBCode')),
575 575
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
576 576
       'internal' => TRUE,
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
     );
579 579
     if (version_compare($editor['installed version'], '3.3', '<')) {
580 580
       $plugins['safari'] = array(
581
-        'path' => $editor['library path'] . '/plugins/safari',
581
+        'path' => $editor['library path'].'/plugins/safari',
582 582
         'extensions' => array('safari' => t('Safari compatibility')),
583 583
         'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
584 584
         'internal' => TRUE,
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
   }
589 589
   if (version_compare($editor['installed version'], '3.2.5', '>=')) {
590 590
     $plugins['autoresize'] = array(
591
-      'path' => $editor['library path'] . '/plugins/autoresize',
591
+      'path' => $editor['library path'].'/plugins/autoresize',
592 592
       'extensions' => array('autoresize' => t('Auto resize')),
593 593
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
594 594
       'internal' => TRUE,
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
   }
598 598
   if (version_compare($editor['installed version'], '3.3', '>=')) {
599 599
     $plugins['advlist'] = array(
600
-      'path' => $editor['library path'] . '/plugins/advlist',
600
+      'path' => $editor['library path'].'/plugins/advlist',
601 601
       'extensions' => array('advlist' => t('Advanced list')),
602 602
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',
603 603
       'internal' => TRUE,
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
   }
607 607
   if (version_compare($editor['installed version'], '3.2.6', '>=')) {
608 608
     $plugins['wordcount'] = array(
609
-      'path' => $editor['library path'] . '/plugins/wordcount',
609
+      'path' => $editor['library path'].'/plugins/wordcount',
610 610
       'extensions' => array('wordcount' => t('Word count')),
611 611
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
612 612
       'internal' => TRUE,
Please login to merge, or discard this patch.