- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'

program/steps/mail/compose.inc

@@ -1262,7 +1262,7 @@ function rcmail_compose_attachment_list($attrib)
 
 function rcmail_compose_attachment_form($attrib)
 {
-  global $RCMAIL, $OUTPUT;
+  global $OUTPUT;
 
   // set defaults
   $attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');
@@ -1382,8 +1382,6 @@ function rcmail_dsn_checkbox($attrib)
 
 function rcmail_editor_selector($attrib)
 {
-  global $CONFIG, $MESSAGE, $compose_mode;
-
   // determine whether HTML or plain text should be checked
   $useHtml = rcmail_compose_editor_mode();
 

skins/default/templates/compose.html

@@ -112,10 +112,12 @@
             </div>
             <div id="compose-editorfooter">
                 <span id="spellcheck-control" style="margin-right:10px"></span>
+                <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
                 <span>
                     <label><roundcube:label name="editortype" /></label>
                     <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
                 </span>
+                <roundcube:endif />
             </div>
         </div>
     </div>

skins/larry/templates/compose.html

@@ -109,10 +109,12 @@
 	</span>
 	
 	<div id="composeoptions">
+		<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
 		<span class="composeoption">
 			<label><roundcube:label name="editortype" />
 				<roundcube:object name="editorSelector" editorid="composebody" tabindex="12" /></label>
 		</span>
+		<roundcube:endif />
 		<span class="composeoption">
 			<label><label for="rcmcomposepriority"><roundcube:label name="priority" />
 				<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></label>