[svn r21922] FS#2867 - The FCKEditor, configuration: Modifications about 'ToolbarLocation' option.

main/inc/lib/fckeditor/fckeditor.php

@@ -183,6 +183,7 @@ class FCKeditor
 		// 1-st level (the highest priority)
 		// Conficuration settings that are created during the initialization of
 		// an editor's instance, they are "hardcoded" by a developer.
+		// 'Width' and 'Height' might be exception of this rule.
 
 		// 2-nd level
 		// Configuration settings from myconfig.php.
@@ -375,20 +376,6 @@ class FCKeditor
 						}
 					}
 					break;
-				case 'ToolbarLocation':
-					if (!empty($toolbar_set) && $toolbar_set != 'Default') {
-						if (is_array($value)) {
-							foreach ($value as $toolbar_name => $toolbar_data) {
-								if ($toolbar_set == $toolbar_name) {		
-									if (!isset($this->Config[$key][$toolbar_name])) {
-										$this->Config[$key] = (string) $toolbar_data;
-									}
-									break;
-								}
-							}
-						}
-					}
-					break;
 				case 'Width':
 					if (!isset($this->Config[$key])) {
 						$this->Config[$key] = (string) $value;

main/inc/lib/fckeditor/toolbars/introduction.php

@@ -31,6 +31,10 @@ $config['ToolbarSets']['IntroductionMaximized'] = array(
 // Possible values: true , false
 //$config['ToolbarStartExpanded'] = true;
 
+//This option sets the location of the toolbar.
+// Possible values: 'In' , 'None' , 'Out:[TargetId]' , 'Out:[TargetWindow]([TargetId])'
+//$config['ToolbarLocation'] = 'In';
+
 // A setting for blocking copy/paste functions of the editor.
 // This setting activates on leaners only. For users with other statuses there is no blocking copy/paste.
 // Possible values: true , false